fix connection pool crash without qapplication (fixes #13166)

jef-n · jef-n · commit f528cb80df73 · 2015-07-28T17:39:22.000+02:00
diff --git a/src/core/qgsconnectionpool.h b/src/core/qgsconnectionpool.h
@@ -31,7 +31,7 @@
 #define CONN_POOL_EXPIRATION_TIME           60    // in seconds
 
 
-/*! Template that stores data related to one server.
+/** Template that stores data related to one server.
  *
  * It is assumed that following functions exist:
  * - void qgsConnectionPool_ConnectionCreate(QString name, T& c)  ... create a new connection
@@ -164,7 +164,8 @@ class QgsConnectionPoolGroup
       QObject::connect( expirationTimer, SIGNAL( timeout() ), parent, SLOT( handleConnectionExpired() ) );
 
       // just to make sure the object belongs to main thread and thus will get events
-      parent->moveToThread( qApp->thread() );
+      if ( qApp )
+        parent->moveToThread( qApp->thread() );
     }
 
     void onConnectionExpired()

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`#define CONN_POOL_EXPIRATION_TIME 60 // in seconds`
`32`	`32`
`33`	`33`
`34`		`-/*! Template that stores data related to one server.`
	`34`	`+/** Template that stores data related to one server.`
`35`	`35`	`*`
`36`	`36`	`* It is assumed that following functions exist:`
`37`	`37`	`* - void qgsConnectionPool_ConnectionCreate(QString name, T& c) ... create a new connection`
`@@ -164,7 +164,8 @@ class QgsConnectionPoolGroup`
`164`	`164`	`QObject::connect( expirationTimer, SIGNAL( timeout() ), parent, SLOT( handleConnectionExpired() ) );`
`165`	`165`
`166`	`166`	`// just to make sure the object belongs to main thread and thus will get events`
`167`		`- parent->moveToThread( qApp->thread() );`
	`167`	`+ if ( qApp )`
	`168`	`+ parent->moveToThread( qApp->thread() );`
`168`	`169`	`}`
`169`	`170`
`170`	`171`	`void onConnectionExpired()`