[Marble-commits] KDE/kdeedu/marble/src/plugins/runner/monav

[Dennis Nienhüser]

SVN commit 1199346 by nienhueser:

Always shutdown monav-routingdaemon on shutdown on Maemo, even if we didn't start it in this instance. This makes it more unlikely that USB mounting is being blocked, or at least provides the workaround of starting and terminating Marble once after a crash to get rid of the block.

 M  +8 -1      MonavPlugin.cpp  


--- trunk/KDE/kdeedu/marble/src/plugins/runner/monav/MonavPlugin.cpp #1199345:1199346
@@ -120,7 +120,14 @@
 
 void MonavPluginPrivate::stopDaemon()
 {
-    if ( m_ownsServer ) {
+    // So far Marble is the only application using monav-routingdaemon on Maemo.
+    // Always shut down the monav server there, since monav-routingdaemon will
+    // survive a crash of Marble and later block mounting a N900 via USB because
+    // it has loaded some data from it. This way if Marble crashed and monav blocks
+    // USB mounting (which the user will not be aware of), another start and shutdown
+    // of Marble will at least fix the USB mount block.
+    bool const smallScreen = MarbleGlobal::getInstance()->profiles() & MarbleGlobal::SmallScreen;
+    if ( smallScreen || m_ownsServer ) {
         m_ownsServer = false;
         QProcess process;
         process.startDetached( "MoNavD", QStringList() << "-t" );