Index: sources/applicationcontroller.cpp
===================================================================
diff -u -r5963f00ffd2c557d3ae06a5deea05032a3a3bd68 -rfeb3423b373dc2a2c4267ef9fcb4d924d738423d
--- sources/applicationcontroller.cpp	(.../applicationcontroller.cpp)	(revision 5963f00ffd2c557d3ae06a5deea05032a3a3bd68)
+++ sources/applicationcontroller.cpp	(.../applicationcontroller.cpp)	(revision feb3423b373dc2a2c4267ef9fcb4d924d738423d)
@@ -21,6 +21,7 @@
 #include "guicontroller.h"
 #include "messagedispatcher.h"
 #include "logger.h"
+#include "usbwatcher.h"
 
 // Singleton
 SINGLETON_INIT(ApplicationController)
@@ -63,9 +64,9 @@
 
     connect(_GuiController , SIGNAL(didUSBDriveUmount()),
             this           ,   SLOT( onUSBDriveUmount()));
-    connect(_FileHandler   , SIGNAL(didUSBDriveMount ()),
+    connect(_USBWatcher    , SIGNAL(didUSBDriveMount ()),
             this           ,   SLOT( onUSBDriveMount ()));
-    connect(_FileHandler   , SIGNAL(didUSBDriveRemove()),
+    connect(_USBWatcher    , SIGNAL(didUSBDriveRemove()),
             this           ,   SLOT( onUSBDriveRemove()));
 
     connect(_GuiController , SIGNAL(didExportLog()),
@@ -113,7 +114,7 @@
 
 void ApplicationController::onUSBDriveUmount()
 {
-    _FileHandler->umounted(true);
+    emit didUSBDriveUmount();
 }
 
 void ApplicationController::onUSBDriveRemove()
@@ -123,7 +124,7 @@
 
 void ApplicationController::onExportLog()
 {
-    _Logger->doExportLog();
+    emit didExportLog();
 }
 
 /*!