diff options
author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:02:17 +0200 |
---|---|---|
committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:02:17 +0200 |
commit | b9203ee84953006547f4afd58f405874c87bf0dc (patch) | |
tree | 9e41f1533f120e9268e86658c52458630ffd718a /Application.cpp | |
parent | 3.0 (diff) | |
download | FreeFileSync-b9203ee84953006547f4afd58f405874c87bf0dc.tar.gz FreeFileSync-b9203ee84953006547f4afd58f405874c87bf0dc.tar.bz2 FreeFileSync-b9203ee84953006547f4afd58f405874c87bf0dc.zip |
3.1
Diffstat (limited to 'Application.cpp')
-rw-r--r-- | Application.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Application.cpp b/Application.cpp index b1a4775f..e579c1c7 100644 --- a/Application.cpp +++ b/Application.cpp @@ -43,7 +43,7 @@ bool Application::OnInit() } -void Application::OnStartApplication(wxIdleEvent& event) +void Application::OnStartApplication(wxIdleEvent&) { Disconnect(wxEVT_IDLE, wxIdleEventHandler(Application::OnStartApplication), NULL, this); @@ -222,9 +222,9 @@ void Application::runBatchMode(const wxString& filename, xmlAccess::XmlGlobalSet //class handling status updates and error messages std::auto_ptr<BatchStatusHandler> statusHandler; //delete object automatically if (batchCfg.silent) - statusHandler.reset(new BatchStatusHandlerSilent(batchCfg.handleError, batchCfg.logFileDirectory, returnValue)); + statusHandler.reset(new BatchStatusHandler(true, &batchCfg.logFileDirectory, batchCfg.handleError, returnValue)); else - statusHandler.reset(new BatchStatusHandlerGui(batchCfg.handleError, returnValue)); + statusHandler.reset(new BatchStatusHandler(false, NULL, batchCfg.handleError, returnValue)); //COMPARE DIRECTORIES FreeFileSync::FolderComparison folderCmp; @@ -241,7 +241,7 @@ void Application::runBatchMode(const wxString& filename, xmlAccess::XmlGlobalSet //check if there are files/folders to be sync'ed at all if (!synchronizationNeeded(folderCmp)) { - statusHandler->addFinalInfo(_("Nothing to synchronize according to configuration!")); //inform about this special case + statusHandler->reportInfo(_("Nothing to synchronize according to configuration!")); //inform about this special case return; } @@ -251,7 +251,7 @@ void Application::runBatchMode(const wxString& filename, xmlAccess::XmlGlobalSet batchCfg.mainCfg.hidden.traverseDirectorySymlinks, globSettings.optDialogs, batchCfg.mainCfg.hidden.verifyFileCopy, - statusHandler.get()); + *statusHandler); const std::vector<FreeFileSync::FolderPairSyncCfg> syncProcessCfg = FreeFileSync::extractSyncCfg(batchCfg.mainCfg); assert(syncProcessCfg.size() == folderCmp.size()); |