claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

qt: Fix error strings

Browse Source
This commit is contained in:
Cacodemon345
2022-02-02 22:08:19 +06:00
parent 221f1f783c
commit a1c0605cbe
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/qt/qt_platform.cpp
View File

@@ -105,7 +105,8 @@ int strnicmp(const char *s1, const char *s2, size_t n)
void void
do_stop(void) do_stop(void)
{ {
QCoreApplication::quit(); cpu_thread_run = 0;
//main_window->close();
} }
void plat_get_exe_name(char *s, int size) void plat_get_exe_name(char *s, int size)

5
src/qt/qt_ui.cpp
View File

@@ -13,6 +13,7 @@ MainWindow* main_window = nullptr;
extern "C" { extern "C" {
#include <86box/plat.h> #include <86box/plat.h>
#include <86box/ui.h>
void void
plat_delay_ms(uint32_t count) plat_delay_ms(uint32_t count)
@@ -58,8 +59,8 @@ int ui_msgbox_header(int flags, void *header, void* message) {
if (header <= (void*)7168) header = plat_get_string((uintptr_t)header); if (header <= (void*)7168) header = plat_get_string((uintptr_t)header);
if (message <= (void*)7168) message = plat_get_string((uintptr_t)message); if (message <= (void*)7168) message = plat_get_string((uintptr_t)message);
auto hdr = QString::fromWCharArray(reinterpret_cast<const wchar_t*>(header)); auto hdr = (flags & MBX_ANSI) ? QString((char*)header) : QString::fromWCharArray(reinterpret_cast<const wchar_t*>(header));
auto msg = QString::fromWCharArray(reinterpret_cast<const wchar_t*>(message)); auto msg = (flags & MBX_ANSI) ? QString((char*)message) : QString::fromWCharArray(reinterpret_cast<const wchar_t*>(message));
// any error in early init // any error in early init
if (main_window == nullptr) { if (main_window == nullptr) {