Folders need to be setup before initializing the GUI

This fixes the incomplete context menu
This commit is contained in:
Daniel Molkentin 2013-11-18 09:34:57 +01:00
parent 08665d6ac2
commit ec850e83b9

View file

@ -94,12 +94,6 @@ Application::Application(int &argc, char **argv) :
//no need to waste time; //no need to waste time;
if ( _helpOnly ) return; if ( _helpOnly ) return;
_gui = new ownCloudGui(this);
if( _showLogWindow ) {
_gui->slotToggleLogBrowser(); // _showLogWindow is set in parseOptions.
}
connect( _gui, SIGNAL(setupProxy()), SLOT(slotSetupProxy()));
setupLogging(); setupLogging();
setupTranslations(); setupTranslations();
@ -125,6 +119,12 @@ Application::Application(int &argc, char **argv) :
FolderMan::instance()->setupFolders(); FolderMan::instance()->setupFolders();
slotSetupProxy(); // folders have to be defined first. slotSetupProxy(); // folders have to be defined first.
_gui = new ownCloudGui(this);
if( _showLogWindow ) {
_gui->slotToggleLogBrowser(); // _showLogWindow is set in parseOptions.
}
connect( _gui, SIGNAL(setupProxy()), SLOT(slotSetupProxy()));
// startup procedure. // startup procedure.
QTimer::singleShot( 0, this, SLOT( slotCheckConnection() )); QTimer::singleShot( 0, this, SLOT( slotCheckConnection() ));