zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-01-31 05:40:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the abort button

Browse source
This commit is contained in:
Magnus Norddahl 2023-12-31 05:08:17 +01:00 committed by Christoph Oelckers
parent 16e578a0f8
commit efde75877d
2 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/common/widgets/netstartwindow.cpp
View file

@ -1,6 +1,7 @@
#include "netstartwindow.h"
#include "version.h"
#include "engineerrors.h"
#include <zwidget/core/timer.h>
#include <zwidget/widgets/textlabel/textlabel.h>
#include <zwidget/widgets/pushbutton/pushbutton.h>
@ -39,12 +40,23 @@ bool NetStartWindow::RunMessageLoop(bool (*newtimer_callback)(void*), void* newu
Instance->timer_callback = newtimer_callback;
Instance->userdata = newuserdata;
Instance->CallbackException = {};
DisplayWindow::RunLoop();
Instance->timer_callback = nullptr;
Instance->userdata = nullptr;
if (Instance->CallbackException)
std::rethrow_exception(Instance->CallbackException);
// Even though the comment in FBasicStartupScreen::NetLoop says we should return false, the old code actually throws an exception!
// This effectively also means the function always returns true...
if (!Instance->exitreason)
{
throw CExitEvent(0);
}
return Instance->exitreason;
}
@ -75,7 +87,7 @@ NetStartWindow::NetStartWindow(const std::string& message, int maxpos) : Widget(
void NetStartWindow::SetProgress(int newpos)
{
if (pos != newpos)
if (pos != newpos && maxpos > 1)
{
pos = newpos;
FString message;
@ -110,9 +122,22 @@ void NetStartWindow::OnGeometryChanged()
void NetStartWindow::OnCallbackTimerExpired()
{
if (timer_callback && timer_callback(userdata))
if (timer_callback)
{
exitreason = true;
DisplayWindow::ExitLoop();
bool result = false;
try
{
result = timer_callback(userdata);
}
catch (...)
{
CallbackException = std::current_exception();
}
if (result)
{
exitreason = true;
DisplayWindow::ExitLoop();
}
}
}

3
src/common/widgets/netstartwindow.h
View file

@ -1,6 +1,7 @@
#pragma once
#include <zwidget/core/widget.h>
#include <stdexcept>
class TextLabel;
class PushButton;
@ -39,5 +40,7 @@ private:
bool exitreason = false;
std::exception_ptr CallbackException;
static NetStartWindow* Instance;
};