fixed issue where autorecovery would show even after startup

This commit is contained in:
itsmattkc
2021-04-01 20:06:32 +11:00
parent 2cae14b71c
commit 29dca59933
2 changed files with 6 additions and 10 deletions
+5 -7
View File
@@ -50,9 +50,7 @@ MainWindow::MainWindow(QWidget *parent) :
taskbar_interface_ = nullptr;
#endif
#ifdef Q_OS_LINUX
checked_graphics_vendor_ = false;
#endif
first_show_ = true;
// Create empty central widget - we don't actually want a central widget (so we set its maximum
// size to 0,0) but some of Qt's docking/undocking fails without it
@@ -635,10 +633,10 @@ void MainWindow::showEvent(QShowEvent *e)
{
QMainWindow::showEvent(e);
QMetaObject::invokeMethod(Core::instance(), "CheckForAutoRecoveries", Qt::QueuedConnection);
if (first_show_) {
QMetaObject::invokeMethod(Core::instance(), "CheckForAutoRecoveries", Qt::QueuedConnection);
#ifdef Q_OS_LINUX
if (!checked_graphics_vendor_) {
// Check for nouveau since that driver really doesn't work with Olive
QOffscreenSurface surface;
surface.create();
@@ -651,9 +649,9 @@ void MainWindow::showEvent(QShowEvent *e)
QMetaObject::invokeMethod(this, "ShowNouveauWarning", Qt::QueuedConnection);
}
checked_graphics_vendor_ = true;
}
first_show_ = false;
#endif
}
}
template<typename T>
+1 -3
View File
@@ -156,9 +156,7 @@ private:
ITaskbarList3* taskbar_interface_;
#endif
#ifdef Q_OS_LINUX
bool checked_graphics_vendor_;
#endif
bool first_show_;
private slots:
void FocusedPanelChanged(PanelWidget* panel);