1.12

1 files changed, 8 insertions, 5 deletions

diff --git a/Application.h b/Application.h
index e240a762..220c81a1 100644
--- a/Application.h
+++ b/Application.h
@@ -15,6 +15,7 @@
 #include "FreeFileSync.h"
 #include "ui/smallDialogs.h"
 #include "library/misc.h"
+#include "library/processXml.h"
 
 class Application : public wxApp
 {
@@ -22,31 +23,33 @@ public:
     bool OnInit();
     int  OnRun();
     int  OnExit();
+    bool OnExceptionInMainLoop();
 
     void initialize();
     bool ProcessIdle(); //virtual method!
 
 private:
-    void runBatchMode(const wxString& filename);
+    void runBatchMode(const wxString& filename, xmlAccess::XmlGlobalSettings& globalSettings);
 
     bool applicationRunsInBatchWithoutWindows;
     CustomLocale programLanguage;
 
     int returnValue;
+    xmlAccess::XmlGlobalSettings globalSettings; //settings used by GUI, batch mode or both
 };
 
 class LogFile;
 
-class BatchStatusUpdater : public StatusUpdater
+class BatchStatusUpdater : public StatusHandler
 {
 public:
     BatchStatusUpdater(bool continueOnError, bool silent, LogFile* log);
     ~BatchStatusUpdater();
 
     void updateStatusText(const wxString& text);
-    void initNewProcess(int objectsTotal, double dataTotal, int processID);
+    void initNewProcess(int objectsTotal, double dataTotal, Process processID);
     void updateProcessedData(int objectsProcessed, double dataProcessed);
-    int reportError(const wxString& text);
+    ErrorHandler::Response reportError(const wxString& text);
     void forceUiRefresh();
 
     void noSynchronizationNeeded();
@@ -60,7 +63,7 @@ private:
     bool silentMode;
 
     wxArrayString unhandledErrors; //list of non-resolved errors
-    int currentProcess;
+    Process currentProcess;
     bool synchronizationNeeded;
 };