nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Qt close-window handling

Browse Source 
Handle the unused variable 'ok' differently.
This commit is contained in:
PatR
2021-02-03 13:42:17 -08:00
parent 78532e3855
commit 14cb015d72
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/Qt/qt_main.cpp
+6 -6
View File
@@ -1374,7 +1374,7 @@ void NetHackQtMainWindow::keyPressEvent(QKeyEvent* event)
// game window's Close button has been activated // game window's Close button has been activated
void NetHackQtMainWindow::closeEvent(QCloseEvent *e UNUSED) void NetHackQtMainWindow::closeEvent(QCloseEvent *e UNUSED)
{ {
// int ok = 0; int ok = 0;
if ( g.program_state.something_worth_saving ) { if ( g.program_state.something_worth_saving ) {
/* this used to offer "Save" and "Cancel" /* this used to offer "Save" and "Cancel"
but cancel (ignoring the close attempt) won't work but cancel (ignoring the close attempt) won't work
@@ -1384,13 +1384,12 @@ void NetHackQtMainWindow::closeEvent(QCloseEvent *e UNUSED)
"&Save and exit", "&Quit without saving", 0, 1); "&Save and exit", "&Quit without saving", 0, 1);
switch (act) { switch (act) {
case 0: case 0:
// See dosave() function // save portion of save-and-exit
// ok = dosave0(); ok = dosave0();
(void) dosave0();
break; break;
case 1: case 1:
// quit -- bypass the prompting preformed by done2() // quit -- bypass the prompting preformed by done2()
// ok = 1; ok = 1;
g.program_state.stopprint++; g.program_state.stopprint++;
::done(QUIT); ::done(QUIT);
/*NOTREACHED*/ /*NOTREACHED*/
@@ -1398,9 +1397,10 @@ void NetHackQtMainWindow::closeEvent(QCloseEvent *e UNUSED)
} }
} else { } else {
/* nothing worth saving; just close/quit */ /* nothing worth saving; just close/quit */
// ok = 1; ok = 1;
} }
/* if !ok, we should try to continue, but we don't... */ /* if !ok, we should try to continue, but we don't... */
nhUse(ok);
u.uhp = -1; u.uhp = -1;
NetHackQtBind::qt_exit_nhwindows(0); NetHackQtBind::qt_exit_nhwindows(0);
nh_terminate(EXIT_SUCCESS); nh_terminate(EXIT_SUCCESS);