unload plugins before terminating after taking a snapshot

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11168 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jul 24, 2009 · b90c5c9 · b90c5c9
1 parent 8d6fed8
commit b90c5c9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/cmake/FindGRASS.cmake b/cmake/FindGRASS.cmake
@@ -11,7 +11,7 @@ MACRO (CHECK_GRASS G_PREFIX)
 
   FOREACH (LIB ${GRASS_LIB_NAMES})
     SET(LIB_PATH NOTFOUND)
-    FIND_LIBRARY(LIB_PATH grass_${LIB} PATHS ${G_PREFIX}/lib)
+    FIND_LIBRARY(LIB_PATH NAMES grass_${LIB} PATHS ${G_PREFIX}/lib NO_DEFAULT_PATH)
 
     IF (LIB_PATH)
       IF (NOT GRASS_LIBRARIES STREQUAL NOTFOUND)

diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -34,6 +34,8 @@
 #include <QTranslator>
 #include <QImageReader>
 
+#include "qgspluginregistry.h"
+
 #include <cstdio>
 #include <stdio.h>
 #include <stdlib.h>
@@ -694,7 +696,7 @@ int main( int argc, char *argv[] )
       It looks like you don't run the event loop in non-interactive mode, so the
       event is never occuring.
 
-      To achieve this without runing the event loop: show the window, then call
+      To achieve this without running the event loop: show the window, then call
       qApp->processEvents(), grab the pixmap, save it, hide the window and exit.
       */
     //qgis->show();
@@ -704,6 +706,9 @@ int main( int argc, char *argv[] )
     qgis->saveMapAsImage( mySnapshotFileName, myQPixmap );
     myApp.processEvents();
     qgis->hide();
+
+    QgsPluginRegistry::instance()->unloadAll();
+
     return 1;
   }
 
@@ -717,5 +722,4 @@ int main( int argc, char *argv[] )
   mypSplash->finish( qgis );
   delete mypSplash;
   return myApp.exec();
-
 }