BeamMP/BeamMP-Launcher
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Launcher.git synced 2026-04-17 13:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix game hanging on launcher error

Browse Source
This commit is contained in:
Sam39
2022-08-09 14:08:52 +03:00
parent 5d885240b6
commit 3810e0eb0b
4 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/Gui.cpp
View File

@@ -17,6 +17,7 @@
#include <wx/tipwin.h>
#include "Launcher.h"
#include "Logger.h"
#include <thread>
#endif
/////////// Inherit App class ///////////
@@ -293,7 +294,7 @@ MyAccountFrame::MyAccountFrame() : wxFrame(nullptr, wxID_ANY, "Account Manager",
wxStaticBitmap *image;
image = new wxStaticBitmap( this, wxID_ANY, wxBitmapBundle(wxImage("icons/BeamMP_black.png", wxBITMAP_TYPE_PNG).Scale(120,120, wxIMAGE_QUALITY_HIGH)), wxPoint(180,20), wxSize(120, 120));
if (!isSignedIn()) {
if (isSignedIn()) {
image->SetBitmap(wxBitmapBundle(wxImage("icons/default.png", wxBITMAP_TYPE_PNG).Scale(120,120, wxIMAGE_QUALITY_HIGH)));
auto* txtName = new wxStaticText(this, wxID_ANY, wxT("Username: BeamMP"), wxPoint(180, 200));
@@ -430,16 +431,17 @@ void MyAccountFrame::OnClickLogout(wxCommandEvent& event WXUNUSED(event)) {
/////////// OnClick Launch Event ///////////
void MyMainFrame::OnClickLaunch(wxCommandEvent& event WXUNUSED(event)) {
static bool FirstTime = true;
/* if (Launcher::EntryThread.joinable()) Launcher::EntryThread.join();
if (Launcher::EntryThread.joinable()) Launcher::EntryThread.join();
Launcher::EntryThread = std::thread([&]() {
entry();
std::this_thread::sleep_for(std::chrono::seconds(2));
txtStatusResult->SetLabelText(wxT("Online"));
txtStatusResult->SetForegroundColour("green");
btnLaunch->Enable();
});
txtStatusResult->SetLabelText(wxT("In-Game"));
txtStatusResult->SetForegroundColour("purple");
btnLaunch->Disable();*/
btnLaunch->Disable();
if(FirstTime) {
wxMessageBox("Please launch BeamNG.drive manually in case of Steam issues.", "Alert");