1 files changed, 16 insertions, 28 deletions
diff --git a/examples/apps/uidesigner/uidesigner.lpr b/examples/apps/uidesigner/uidesigner.lpr
index 9405a668..fe3c980d 100644
--- a/examples/apps/uidesigner/uidesigner.lpr
+++ b/examples/apps/uidesigner/uidesigner.lpr
@@ -31,34 +31,22 @@ uses
 procedure MainProc;
 begin
   fpgApplication.Initialize;
-
-  RegisterWidgets;
-  PropList := TPropertyList.Create;
-  maindsgn := TMainDesigner.Create;
-  maindsgn.CreateWindows;
-  maindsgn.EditedFileName := ParamStr(1);
-  if FileExists(maindsgn.EditedFileName) then
-    maindsgn.OnLoadFile(maindsgn);
-
-  // Note:  This needs improving!!
-  fpgApplication.ProcessMessages;
-  repeat
-    fpgWaitWindowMessage;
-  until (not frmMain.Visible);
-  
-{
-  repeat
-    try
-      fpgDoMessageLoop;
-      break;
-    except
-      on e: Exception do
-        ShowMessage(e.message, 'Exception');
-    end;
-  until False;
-}
-
-//  fpgApplication.Run;
+  try
+    RegisterWidgets;
+    PropList := TPropertyList.Create;
+    maindsgn := TMainDesigner.Create;
+    maindsgn.CreateWindows;
+    maindsgn.EditedFileName := ParamStr(1);
+    if FileExists(maindsgn.EditedFileName) then
+      maindsgn.OnLoadFile(maindsgn);
+
+    // Note:  This needs improving!!
+    fpgApplication.MainForm := frmMain;
+    fpgApplication.Run;
+    
+  finally
+    maindsgn.Free;
+  end;
 end;
 
 begin