80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

qt: Avoid crashes on X11 at exit

Browse Source
This commit is contained in:
Cacodemon345
2022-02-17 11:45:42 +06:00
parent 4f9af2eb77
commit be3501cfe1
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/qt/qt_mainwindow.cpp
View File

@@ -445,6 +445,10 @@ void MainWindow::closeEvent(QCloseEvent *event) {
} }
qt_nvr_save(); qt_nvr_save();
config_save(); config_save();
#ifdef __unix__
extern void xinput2_exit();
if (QApplication::platformName() == "xcb") xinput2_exit();
#endif
event->accept(); event->accept();
} }

9
src/qt/xinput2_mouse.cpp
View File

@@ -152,9 +152,12 @@ void xinput2_proc()
void xinput2_exit() void xinput2_exit()
{ {
exitthread = true; if (!exitthread)
procThread->wait(5000); {
procThread->terminate(); exitthread = true;
procThread->wait(5000);
procThread->terminate();
}
} }
void xinput2_init() void xinput2_init()