new MediaList();
new MediaView();
new Storage();
- if (m_openBrowser)
+ if (m_openBrowser) {
new restoreTree();
- if (m_openDirStat)
+ }
+ if (m_openDirStat) {
new DirStat();
-
+ }
treeWidget->expandItem(topItem);
tabWidget->setCurrentWidget(m_currentConsole);
}
*/
void MainWin::waitExit()
{
+ if (!m_waitState || m_isClosing) {
+ return;
+ }
m_waitState = false;
if (mainWin->m_connDebug) Pmsg0(000, "Exiting Wait State\n");
- if (m_waitTreeItem != treeWidget->currentItem())
+ if (m_waitTreeItem && (m_waitTreeItem != treeWidget->currentItem())) {
treeWidget->setCurrentItem(m_waitTreeItem);
+ }
if (m_doConnect) {
connectSignals();
connectConsoleSignals();
}
/* set the value for the currently active console */
int stackindex = tabWidget->indexOf(nextPage);
- if (!nextPage->isOnceDocked()) {
- nextPage->dockPage();
- }
+ nextPage->firstUseDock();
/* Is this page currently on the stack or is it undocked */
if (stackindex >= 0) {