Disable watchDog when plugin was loaded successfully

m-kuhn · m-kuhn · commit 08a1b072eb3c · 2016-03-17T15:10:48.000+01:00
diff --git a/src/app/qgspluginregistry.cpp b/src/app/qgspluginregistry.cpp
@@ -292,6 +292,8 @@ void QgsPluginRegistry::loadPythonPlugin( const QString& packageName )
     // add to settings
     settings.setValue( "/PythonPlugins/" + packageName, true );
     QgsMessageLog::logMessage( QObject::tr( "Loaded %1 (package: %2)" ).arg( pluginName, packageName ), QObject::tr( "Plugins" ), QgsMessageLog::INFO );
+
+    settings.remove( "/PythonPlugins/watchDog/" + packageName );
   }
 }
 
@@ -370,6 +372,8 @@ void QgsPluginRegistry::loadCppPlugin( const QString& theFullPathName )
               QgsDebugMsg( QString( "plugin parent already set" ) );
             }
           }
+
+          settings.remove( "/Plugins/watchDog/" + baseName );
         }
         else
         {

Original file line number	Diff line number	Diff line change
`@@ -292,6 +292,8 @@ void QgsPluginRegistry::loadPythonPlugin( const QString& packageName )`
`292`	`292`	`// add to settings`
`293`	`293`	`settings.setValue( "/PythonPlugins/" + packageName, true );`
`294`	`294`	`QgsMessageLog::logMessage( QObject::tr( "Loaded %1 (package: %2)" ).arg( pluginName, packageName ), QObject::tr( "Plugins" ), QgsMessageLog::INFO );`
	`295`	`+`
	`296`	`+ settings.remove( "/PythonPlugins/watchDog/" + packageName );`
`295`	`297`	`}`
`296`	`298`	`}`
`297`	`299`
`@@ -370,6 +372,8 @@ void QgsPluginRegistry::loadCppPlugin( const QString& theFullPathName )`
`370`	`372`	`QgsDebugMsg( QString( "plugin parent already set" ) );`
`371`	`373`	`}`
`372`	`374`	`}`
	`375`	`+`
	`376`	`+ settings.remove( "/Plugins/watchDog/" + baseName );`
`373`	`377`	`}`
`374`	`378`	`else`
`375`	`379`	`{`