From 8bf668665b107469086f16cb8ad23e47d479d2b4 Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 18 Apr 2014 17:14:37 +0200
Subject: 4.0

---
 Application.cpp | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'Application.cpp')

diff --git a/Application.cpp b/Application.cpp
index 48bd1155..638cffbc 100644
--- a/Application.cpp
+++ b/Application.cpp
@@ -173,7 +173,7 @@ int Application::OnRun()
         wxFile safeOutput(zen::getConfigDir() + wxT("LastError.txt"), wxFile::write);
         safeOutput.Write(wxString::FromAscii(e.what()));
 
-        wxSafeShowMessage(_("An exception occurred!"), wxString::FromAscii(e.what()));
+        wxSafeShowMessage(_("An exception occurred!") + L" - FFS", wxString::FromAscii(e.what()));
         return -9;
     }
     catch (...) //catch the rest
@@ -260,28 +260,26 @@ void Application::runBatchMode(const wxString& filename, xmlAccess::XmlGlobalSet
         });
 
         //COMPARE DIRECTORIES
-        zen::CompareProcess comparison(globSettings.fileTimeTolerance,
-                                       globSettings.optDialogs,
-                                       statusHandler);
+        zen::CompareProcess cmpProc(globSettings.fileTimeTolerance,
+                                    globSettings.optDialogs,
+                                    statusHandler);
 
         zen::FolderComparison folderCmp;
-        comparison.startCompareProcess(cmpConfig,
-                                       batchCfg.mainCfg.compareVar,
-                                       folderCmp);
+        cmpProc.startCompareProcess(cmpConfig, folderCmp);
 
         //START SYNCHRONIZATION
-        zen::SyncProcess synchronization(
+        zen::SyncProcess syncProc(
             globSettings.optDialogs,
             globSettings.verifyFileCopy,
             globSettings.copyLockedFiles,
             globSettings.copyFilePermissions,
-			globSettings.transactionalFileCopy,
+            globSettings.transactionalFileCopy,
             statusHandler);
 
         const std::vector<zen::FolderPairSyncCfg> syncProcessCfg = zen::extractSyncCfg(batchCfg.mainCfg);
         assert(syncProcessCfg.size() == folderCmp.size());
 
-        synchronization.startSynchronizationProcess(syncProcessCfg, folderCmp);
+        syncProc.startSynchronizationProcess(syncProcessCfg, folderCmp);
 
         //play (optional) sound notification after sync has completed
         if (!batchCfg.silent)
-- 
cgit