IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ensure the runtime core application is setup before trying to access any settings. Fixes #3333

Browse Source
This commit is contained in:
Dave Page 2018-05-08 09:54:33 +01:00
parent 3ac3e73daf
commit c68848e7f3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_3_1.rst
View File

@ -22,3 +22,4 @@ Bug fixes
| `Bug #3308 <https://redmine.postgresql.org/issues/3308>`_ - Fixed issue where icon for Partitioned tables was the same as Non Partitioned tables for Greenplum database | `Bug #3308 <https://redmine.postgresql.org/issues/3308>`_ - Fixed issue where icon for Partitioned tables was the same as Non Partitioned tables for Greenplum database
| `Bug #3238 <https://redmine.postgresql.org/issues/3238>`_ - Standardise the error handling for parsing of JSON response messages from the server. | `Bug #3238 <https://redmine.postgresql.org/issues/3238>`_ - Standardise the error handling for parsing of JSON response messages from the server.
| `Bug #3324 <https://redmine.postgresql.org/issues/3324>`_ - Fix the template loader to work reliably under Windows (fixing external tables under Greenplum) | `Bug #3324 <https://redmine.postgresql.org/issues/3324>`_ - Fix the template loader to work reliably under Windows (fixing external tables under Greenplum)
| `Bug #3333 <https://redmine.postgresql.org/issues/3333>`_ - Ensure the runtime core application is setup before trying to access any settings.

5
runtime/pgAdmin4.cpp
View File

@ -42,8 +42,6 @@ QString addrFileName;
int main(int argc, char * argv[]) int main(int argc, char * argv[])
{ {
QSettings settings;
/* /*
* Before starting main application, need to set 'QT_X11_NO_MITSHM=1' * Before starting main application, need to set 'QT_X11_NO_MITSHM=1'
* to make the runtime work with IBM PPC machine. * to make the runtime work with IBM PPC machine.
@ -108,6 +106,8 @@ int main(int argc, char * argv[])
} }
sema.release(); sema.release();
QSettings settings;
if (is_running){ if (is_running){
addrFile.open(QIODevice::ReadOnly | QIODevice::Text); addrFile.open(QIODevice::ReadOnly | QIODevice::Text);
QTextStream in(&addrFile); QTextStream in(&addrFile);
@ -258,7 +258,6 @@ int main(int argc, char * argv[])
QMessageBox::critical(NULL, QString(QWidget::tr("Fatal Error")), error); QMessageBox::critical(NULL, QString(QWidget::tr("Fatal Error")), error);
// Allow the user to tweak the Python Path if needed // Allow the user to tweak the Python Path if needed
QSettings settings;
bool ok; bool ok;
ConfigWindow *dlg = new ConfigWindow(); ConfigWindow *dlg = new ConfigWindow();