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

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source
This commit is contained in:
OBattler
2022-02-10 16:46:38 +01:00
parent 6d7de97d3b a94ffbfb1d
commit c44dd4bb9a
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/qt/qt_mainwindow.cpp
View File

@@ -123,7 +123,9 @@ MainWindow::MainWindow(QWidget *parent) :
this->setWindowFlag(Qt::MSWindowsFixedSizeDialogHint, vid_resize != 1); this->setWindowFlag(Qt::MSWindowsFixedSizeDialogHint, vid_resize != 1);
this->setWindowFlag(Qt::WindowMaximizeButtonHint, vid_resize == 1); this->setWindowFlag(Qt::WindowMaximizeButtonHint, vid_resize == 1);
this->setWindowTitle(QString("%1 - %2 %3").arg(vm_name, EMU_NAME, EMU_VERSION_FULL)); QString vmname(vm_name);
if (vmname.at(vmname.size() - 1) == '"' || vmname.at(vmname.size() - 1) == '\'') vmname.truncate(vmname.size() - 1);
this->setWindowTitle(QString("%1 - %2 %3").arg(vmname, EMU_NAME, EMU_VERSION_FULL));
connect(this, &MainWindow::showMessageForNonQtThread, this, &MainWindow::showMessage_, Qt::BlockingQueuedConnection); connect(this, &MainWindow::showMessageForNonQtThread, this, &MainWindow::showMessage_, Qt::BlockingQueuedConnection);

2
src/qt/qt_platform.cpp
View File

@@ -258,7 +258,7 @@ plat_tempfile(char *bufp, char *prefix, char *suffix)
name.append(QDateTime::currentDateTime().toString("yyyyMMdd-hhmmss-zzzz")); name.append(QDateTime::currentDateTime().toString("yyyyMMdd-hhmmss-zzzz"));
if (suffix) name.append(suffix); if (suffix) name.append(suffix);
sprintf(&bufp[strlen(bufp)], "%s", name.toUtf8().data()); strcpy(bufp, name.toUtf8().data());
} }
void plat_remove(char* path) void plat_remove(char* path)

4
src/qt/qt_progsettings.cpp
View File

@@ -121,7 +121,9 @@ void ProgSettings::accept()
reloadStrings(); reloadStrings();
update_mouse_msg(); update_mouse_msg();
main_window->ui->retranslateUi(main_window); main_window->ui->retranslateUi(main_window);
main_window->setWindowTitle(QString("%1 - %2 %3").arg(vm_name, EMU_NAME, EMU_VERSION_FULL)); QString vmname(vm_name);
if (vmname.at(vmname.size() - 1) == "\"" || vmname.at(vmname.size() - 1) == "'") vmname.truncate(vmname.size() - 1);
main_window->setWindowTitle(QString("%1 - %2 %3").arg(vmname, EMU_NAME, EMU_VERSION_FULL));
QString msg = main_window->status->getMessage(); QString msg = main_window->status->getMessage();
main_window->status.reset(new MachineStatus(main_window)); main_window->status.reset(new MachineStatus(main_window));
main_window->refreshMediaMenu(); main_window->refreshMediaMenu();