eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30 from MaSzyna-EU07/fix-experimental

Browse Source 
Some platform release fixes
This commit is contained in:
Hirek
2025-11-16 17:09:16 +01:00
committed by GitHub
parent d01da681b2 acc4cca4c2
commit 392ca6987c
7 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
EU07.cpp
View File

@@ -29,7 +29,7 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others
#endif #endif
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma comment(linker, "/subsystem:console /ENTRY:mainCRTStartup") #pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup")
#endif #endif
void export_e3d_standalone(std::string in, std::string out, int flags, bool dynamic); void export_e3d_standalone(std::string in, std::string out, int flags, bool dynamic);

2
Globals.cpp
View File

@@ -488,7 +488,7 @@ global_settings::ConfigParse(cParser &Parser) {
// tryb antyaliasingu: 0=brak,1=2px,2=4px // tryb antyaliasingu: 0=brak,1=2px,2=4px
Parser.getTokens(1, false); Parser.getTokens(1, false);
Parser >> iMultisampling; Parser >> iMultisampling;
iMultisampling = clamp(iMultisampling, 0, 3); iMultisampling = clamp(iMultisampling, 0, 4); // liczone 2 ^ n
} }
else if (token == "latitude") else if (token == "latitude")
{ {

21
application.cpp
View File

@@ -55,7 +55,6 @@ http://mozilla.org/MPL/2.0/.
eu07_application Application; eu07_application Application;
screenshot_manager screenshot_man; screenshot_manager screenshot_man;
ui_layer uilayerstaticinitializer; ui_layer uilayerstaticinitializer;
#ifdef _WIN32 #ifdef _WIN32
@@ -581,6 +580,9 @@ eu07_application::run() {
std::this_thread::sleep_for( Global.minframetime - frametime ); std::this_thread::sleep_for( Global.minframetime - frametime );
} }
} }
Global.applicationQuitOrder = true;
Global.threads["DiscordRPC"].join(); // wait for DiscordRPC thread to finish
Global.threads["LogService"].join(); // wait for logging thread to finish
return 0; return 0;
} }
@@ -613,8 +615,19 @@ eu07_application::release_python_lock() {
void void
eu07_application::exit() { eu07_application::exit() {
Global.applicationQuitOrder = true; Global.applicationQuitOrder = true;
Global.threads["LogService"].join(); // kill log service auto it = Global.threads.find("LogService");
Global.threads["DiscordRPC"].join(); // kill DiscordRPC service if (it != Global.threads.end())
{
if (it->second.joinable())
it->second.join();
}
it = Global.threads.find("DiscordRPC");
if (it != Global.threads.end())
{
if (it->second.joinable())
it->second.join();
}
for (auto &mode : m_modes) for (auto &mode : m_modes)
@@ -907,7 +920,7 @@ eu07_application::init_settings( int Argc, char *Argv[] ) {
#ifdef _WIN32 #ifdef _WIN32
if (const char *appdata = std::getenv("APPDATA")) if (const char *appdata = std::getenv("APPDATA"))
{ {
iniPath = fs::path(appdata) / "MaSzyna" / "Config" / "eu07.ini"; iniPath = fs::path(appdata) / "MaSzyna" / "eu07.ini";
} }
#else #else
if (const char *home = std::getenv("HOME")) if (const char *home = std::getenv("HOME"))

2
drivermouseinput.cpp
View File

@@ -185,7 +185,7 @@ drivermouse_input::recall_bindings() {
#ifdef _WIN32 #ifdef _WIN32
if (const char *appdata = std::getenv("APPDATA")) if (const char *appdata = std::getenv("APPDATA"))
{ {
fs::path appPath = fs::path(appdata) / "MaSzyna" / "Config" / "eu07_input-mouse.ini"; fs::path appPath = fs::path(appdata) / "MaSzyna" / "eu07_input-mouse.ini";
if (fs::exists(appPath)) if (fs::exists(appPath))
filePath = appPath.string(); filePath = appPath.string();
} }

2
gamepadinput.cpp
View File

@@ -159,7 +159,7 @@ gamepad_input::recall_bindings() {
#ifdef _WIN32 #ifdef _WIN32
if (const char *appdata = std::getenv("APPDATA")) if (const char *appdata = std::getenv("APPDATA"))
{ {
fs::path appPath = fs::path(appdata) / "MaSzyna" / "Config" / "eu07_input-gamepad.ini"; fs::path appPath = fs::path(appdata) / "MaSzyna" / "eu07_input-gamepad.ini";
if (fs::exists(appPath)) if (fs::exists(appPath))
filePath = appPath.string(); filePath = appPath.string();
} }

2
keyboardinput.cpp
View File

@@ -127,7 +127,7 @@ keyboard_input::recall_bindings() {
#ifdef _WIN32 #ifdef _WIN32
if (const char *appdata = std::getenv("APPDATA")) if (const char *appdata = std::getenv("APPDATA"))
{ {
iniPath = fs::path(appdata) / "MaSzyna" / "Config" / "eu07_input-keyboard.ini"; iniPath = fs::path(appdata) / "MaSzyna" / "eu07_input-keyboard.ini";
} }
#else #else
if (const char *home = std::getenv("HOME")) if (const char *home = std::getenv("HOME"))

2
uart.cpp
View File

@@ -197,7 +197,7 @@ uart_input::recall_bindings() {
#ifdef _WIN32 #ifdef _WIN32
if (const char *appdata = std::getenv("APPDATA")) if (const char *appdata = std::getenv("APPDATA"))
{ {
fs::path appPath = fs::path(appdata) / "MaSzyna" / "Config" / "eu07_input-uart.ini"; fs::path appPath = fs::path(appdata) / "MaSzyna" / "eu07_input-uart.ini";
if (fs::exists(appPath)) if (fs::exists(appPath))
filePath = appPath.string(); filePath = appPath.string();
} }