diff -r e0b83131558d -r 313976a11e23 controlpanelui/src/tonefetcher/src/main.cpp
--- a/controlpanelui/src/tonefetcher/src/main.cpp	Fri Jul 23 11:04:51 2010 +0800
+++ b/controlpanelui/src/tonefetcher/src/main.cpp	Thu Aug 05 11:28:29 2010 +0800
@@ -25,12 +25,17 @@
 {
     HbApplication a(argc, argv);
     
-    
+#ifdef ENABLE_TONEFETCHER_LOG
     Logger::instance(TONEFETCHER_LOGGER_NAME)->configure(
             TF_LOGGER_CONFIG_PATH,QSettings::IniFormat);
-
+#endif
     TF_LOG("Entering tonefetcher.exe...");
     ToneFetcherMainWindow w;   
     w.show();
-    return a.exec();
+    int ret = a.exec();
+    TF_LOG("Leaving tonefetcher.exe...");
+#ifdef ENABLE_TONEFETCHER_LOG
+    Logger::closeAll();
+#endif
+    return ret;
 }