check parameters after options check sothat usign -version doesn't result in an error

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/tex2rtf/src/tex2rtf.cpp b/utils/tex2rtf/src/tex2rtf.cpp
index 68d06b7d221e81ab2f598e16a1904904e725e15c..6e117564396e0060ef148942a3828149525da21a 100644 (file)
--- a/utils/tex2rtf/src/tex2rtf.cpp
+++ b/utils/tex2rtf/src/tex2rtf.cpp
@@ -185,22 +185,6 @@ bool MyApp::OnInit()
 
   TexPathList.Add(::wxGetCwd());
 
 
   TexPathList.Add(::wxGetCwd());
 

-#ifdef NO_GUI
-  if (InputFile.empty() || OutputFile.empty())
-  {
-      wxSTD cout << "Tex2RTF: input or output file is missing.\n";
-      ShowOptions();
-      exit(1);
-  }
-#endif
-
-  if (!InputFile.empty())
-  {
-      TexPathList.EnsureFileAccessible(InputFile);
-  }
-  if (InputFile.empty() || OutputFile.empty())
-      isInteractive = true;
-

   int i;
   for (i = n; i < argc;)
   {
   int i;
   for (i = n; i < argc;)
   {


@@ -299,7 +283,6 @@ bool MyApp::OnInit()
       i ++;
       ShowVersion();
 #ifdef NO_GUI
       i ++;
       ShowVersion();
 #ifdef NO_GUI

-      ShowOptions();

       exit(1);
 #else
       return false;
       exit(1);
 #else
       return false;


@@ -319,6 +302,22 @@ bool MyApp::OnInit()
     }
   }
 
     }
   }
 

+#ifdef NO_GUI
+  if (InputFile.empty() || OutputFile.empty())
+  {
+      wxSTD cout << "Tex2RTF: input or output file is missing.\n";
+      ShowOptions();
+      exit(1);
+  }
+#endif
+
+  if (!InputFile.empty())
+  {
+      TexPathList.EnsureFileAccessible(InputFile);
+  }
+  if (InputFile.empty() || OutputFile.empty())
+      isInteractive = true;
+

 #if defined(__WXMSW__) && !defined(NO_GUI)
   wxDDEInitialize();
   Tex2RTFLastStatus[0] = 0; // DDE connection return value
 #if defined(__WXMSW__) && !defined(NO_GUI)
   wxDDEInitialize();
   Tex2RTFLastStatus[0] = 0; // DDE connection return value