mirror of
https://github.com/lutris/lutris
synced 2024-11-02 07:10:17 +00:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
097b076694
2 changed files with 1 additions and 2 deletions
|
@ -33,6 +33,7 @@ class ImportGameDialog(ModelessDialog):
|
|||
self.error_labels = {}
|
||||
self.launch_buttons = {}
|
||||
self.platform = None
|
||||
self.search_call = None
|
||||
self.set_size_request(500, 560)
|
||||
|
||||
self.accelerators = Gtk.AccelGroup()
|
||||
|
@ -131,7 +132,6 @@ class ImportGameDialog(ModelessDialog):
|
|||
# Found a game to launch instead of installing, but we can't safely
|
||||
# do this on this thread, so we return the game and handle it later.
|
||||
return [{"name": existing_game.name, "game": existing_game, "roms": []}]
|
||||
|
||||
show_progress(filepath, _("Calculating checksum..."))
|
||||
if filepath.lower().endswith(".zip"):
|
||||
md5 = get_md5_in_zip(filepath)
|
||||
|
|
|
@ -26,7 +26,6 @@ RUNTIME_DIR = sio.read_setting("runtime_dir") or os.path.join(DATA_DIR, "runtime
|
|||
CACHE_DIR = sio.read_setting("cache_dir") or os.path.join(GLib.get_user_cache_dir(), "lutris")
|
||||
GAME_CONFIG_DIR = os.path.join(CONFIG_DIR, "games")
|
||||
|
||||
TMP_PATH = os.path.join(CACHE_DIR, "tmp")
|
||||
SHADER_CACHE_DIR = os.path.join(CACHE_DIR, "shaders")
|
||||
BANNER_PATH = os.path.join(CACHE_DIR, "banners")
|
||||
COVERART_PATH = os.path.join(CACHE_DIR, "coverart")
|
||||
|
|
Loading…
Reference in a new issue