Skip to content

Commit db53b2f

Browse files
committed
.
1 parent 1ca1315 commit db53b2f

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

cpp/version.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
set(VERSION_MAJOR 6)
33
set(VERSION_MINOR 17)
4-
set(VERSION_PATCH 3)
4+
set(VERSION_PATCH 4)
55
set(VERSION_REVISION 0)
66
set(LUNA_VERSION "{${VERSION_MAJOR},${VERSION_MINOR},${VERSION_PATCH},${VERSION_REVISION}}")
77
add_library(VERSION_DEF ${CMAKE_CURRENT_LIST_DIR}/version_def.cpp)

py/LunaTranslator/myutils/localetools.py

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
import windows, os, winsharedutils, re, functools
22
from qtsymbols import *
3-
from myutils.config import savehook_new_data, get_launchpath, globalconfig, get_platform, _TR
3+
from myutils.config import (
4+
savehook_new_data,
5+
get_launchpath,
6+
globalconfig,
7+
get_platform,
8+
_TR,
9+
)
410
from gui.usefulwidget import getlineedit, getsimplecombobox, getsimplepatheditor
511
from traceback import print_exc
612
import xml.etree.ElementTree as ET
@@ -377,8 +383,9 @@ def run(self, gameexe, argsdict):
377383
x64tools = [lr_internal, NTLEAS64, CommandLine, Direct]
378384

379385

380-
def getgamecamptools(gameexe):
381-
b = windows.GetBinaryType(gameexe)
386+
def getgamecamptools(gameexe, b=None):
387+
if b is None:
388+
b = windows.GetBinaryType(gameexe)
382389
if b == 6:
383390
_methods = x64tools
384391
else:
@@ -399,10 +406,11 @@ def fundlauncher(_id):
399406

400407
def localeswitchedrun(gameuid):
401408
config = savehook_new_data[gameuid]
402-
launch_method = config.get("launch_method", None)
403409
gameexe = get_launchpath(gameuid)
404410
gameexe = os.path.abspath(gameexe)
405-
tools = getgamecamptools(gameexe)
411+
b = windows.GetBinaryType(gameexe)
412+
launch_method = config.get("launch_method", {6: "direct", 0: "le"}.get(b))
413+
tools = getgamecamptools(gameexe, b)
406414
ids = [_.id for _ in tools]
407415
if launch_method not in ids:
408416
index = 0

0 commit comments

Comments
 (0)