Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
base repository: sysrqb/vidalia
base: master
head repository: sysrqb/vidalia
compare: bug10420
Checking mergeability… Don’t worry, you can still create the pull request.
  • 1 commit
  • 1 file changed
  • 0 comments
  • 1 contributor
Commits on Dec 17, 2013
@sysrqb
Instantiate the tor controller before gui elements
823f591 
The Tor Controller should be instantiated before the other gui elements
because we want the slots in MainWindow to be called first when a signal
is emitted from the controller. Some of the ui elements will block other
ui updates otherwise. Specifically, this currently prevents the
MainWindow instance from updating until all router descriptors are
parsed.  Fixes #10420
Showing with 25 additions and 25 deletions.
  1. +25 −25 src/vidalia/MainWindow.cpp
50 src/vidalia/MainWindow.cpp
View file
@@ -111,31 +111,6 @@ MainWindow::MainWindow()
Vidalia::createShortcut("Ctrl+W", this, ui.btnHide, SLOT(click()));
Vidalia::createShortcut("Esc", this, ui.btnHide, SLOT(click()));

/* Create all the dialogs of which we only want one instance */
_messageLog = new MessageLog();
_bandwidthGraph = new BandwidthGraph();
_netViewer = new NetViewer();
_configDialog = new ConfigDialog();
_menuBar = 0;
connect(_messageLog, SIGNAL(helpRequested(QString)),
this, SLOT(showHelpDialog(QString)));
connect(_netViewer, SIGNAL(helpRequested(QString)),
this, SLOT(showHelpDialog(QString)));
connect(_configDialog, SIGNAL(helpRequested(QString)),
this, SLOT(showHelpDialog(QString)));
connect(_configDialog, SIGNAL(restartTor()),
this, SLOT(restart()));

/* Create the actions that will go in the tray menu */
createActions();
/* Creates a tray icon with a context menu and adds it to the system's
* notification area. */
createTrayIcon();
/* Start with Tor initially stopped */
_status = Unset;
_isVidaliaRunningTor = false;
updateTorStatus(Stopped);

/* Create a new TorControl object, used to communicate with Tor */
_torControl = Vidalia::torControl();
connect(_torControl, SIGNAL(started()), this, SLOT(started()));
@@ -167,6 +142,31 @@ MainWindow::MainWindow()
connect(_torControl, SIGNAL(logMessage(tc::Severity, QString)),
this, SLOT(log(tc::Severity, QString)));

/* Create all the dialogs of which we only want one instance */
_messageLog = new MessageLog();
_bandwidthGraph = new BandwidthGraph();
_netViewer = new NetViewer();
_configDialog = new ConfigDialog();
_menuBar = 0;
connect(_messageLog, SIGNAL(helpRequested(QString)),
this, SLOT(showHelpDialog(QString)));
connect(_netViewer, SIGNAL(helpRequested(QString)),
this, SLOT(showHelpDialog(QString)));
connect(_configDialog, SIGNAL(helpRequested(QString)),
this, SLOT(showHelpDialog(QString)));
connect(_configDialog, SIGNAL(restartTor()),
this, SLOT(restart()));

/* Create the actions that will go in the tray menu */
createActions();
/* Creates a tray icon with a context menu and adds it to the system's
* notification area. */
createTrayIcon();
/* Start with Tor initially stopped */
_status = Unset;
_isVidaliaRunningTor = false;
updateTorStatus(Stopped);

/* Create a new HelperProcess object, used to start the web browser */
_browserProcess = new HelperProcess(this);
connect(_browserProcess, SIGNAL(finished(int, QProcess::ExitStatus)),

No commit comments for this range