one level deeper

3nids · 3nids · commit 810241ffca55 · 2018-04-09T10:27:31.000-04:00
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -208,10 +208,10 @@ void QgsApplication::init( QString profileFolder )
   }
   else
   {
-    if ( ABISYM( mPrefixPath ).isNull() )
+    char *prefixPath = getenv( "QGIS_PREFIX_PATH" );
+    if ( !prefixPath )
     {
-      char *prefixPath = getenv( "QGIS_PREFIX_PATH" );
-      if ( !prefixPath )
+      if ( ABISYM( mPrefixPath ).isNull() )
       {
 #if defined(Q_OS_MACX) || defined(Q_OS_WIN)
         setPrefixPath( applicationDirPath(), true );

Original file line number	Diff line number	Diff line change
`@@ -208,10 +208,10 @@ void QgsApplication::init( QString profileFolder )`
`208`	`208`	`}`
`209`	`209`	`else`
`210`	`210`	`{`
`211`		`- if ( ABISYM( mPrefixPath ).isNull() )`
	`211`	`+ char *prefixPath = getenv( "QGIS_PREFIX_PATH" );`
	`212`	`+ if ( !prefixPath )`
`212`	`213`	`{`
`213`		`- char *prefixPath = getenv( "QGIS_PREFIX_PATH" );`
`214`		`- if ( !prefixPath )`
	`214`	`+ if ( ABISYM( mPrefixPath ).isNull() )`
`215`	`215`	`{`
`216`	`216`	`#if defined(Q_OS_MACX) \|\| defined(Q_OS_WIN)`
`217`	`217`	`setPrefixPath( applicationDirPath(), true );`