Two small additional fixes for Lazarus

[d2df-editor.git] / src / editor / Editor.lpr

diff --git a/src/editor/Editor.lpr b/src/editor/Editor.lpr
index 71f5906bf6784736fa889e0cb245e44726b9d4a2..8bd60c2e3f98df376d9203d5c42743332cebdd36 100644 (file)
--- a/src/editor/Editor.lpr
+++ b/src/editor/Editor.lpr
@@ -49,10 +49,14 @@ uses
   g_language in 'g_language.pas',
   f_selectlang in 'f_selectlang.pas' {SelectLanguageForm};
 
-{$R *.res}
+{$IFDEF WINDOWS}
+  {$R *.res}
+{$ENDIF}
 
 begin
-  Application.Initialize;
+  Application.ExceptionDialog := aedOkMessageBox;
+  Application.Initialize();
+
   Application.CreateForm(TMainForm, MainForm);
   Application.CreateForm(TOptionsForm, OptionsForm);
   Application.CreateForm(TAboutForm, AboutForm);
@@ -72,7 +76,7 @@ begin
   Application.CreateForm(TMapTestForm, MapTestForm);
   Application.CreateForm(TChooseTypeForm, ChooseTypeForm);
   Application.CreateForm(TSelectLanguageForm, SelectLanguageForm);
-  if ParamStr(1) <> '' then OpenMap(ParamStr(1), '');
 
-  Application.Run;
+  if ParamStr(1) <> '' then OpenMap(ParamStr(1), '');
+  Application.Run();
 end.