From 0af00f4ef4290c42232997337ead07fe998f967c Mon Sep 17 00:00:00 2001
From: axtloss <axtlos@tar.black>
Date: Thu, 14 Jul 2022 18:21:28 +0200
Subject: [PATCH] Fix issue in ConfigManager

this fixes #1772
---
 AppImageBuilder.yml                        | 2 +-
 VERSION                                    | 2 +-
 data/com.usebottles.bottles.appdata.xml.in | 2 +-
 debian/changelog                           | 2 +-
 meson.build                                | 2 +-
 src/backend/managers/conf.py               | 2 +-
 src/backend/managers/installer.py          | 2 +-
 src/params.py                              | 4 ++--
 src/ui/about.ui                            | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/AppImageBuilder.yml b/AppImageBuilder.yml
index 881b001e097..6b7f50d9a68 100644
--- a/AppImageBuilder.yml
+++ b/AppImageBuilder.yml
@@ -77,7 +77,7 @@ AppDir:
     id: com.usebottles.bottles
     name: Bottles
     icon: com.usebottles.bottles
-    version: 2022.7.14-brescia
+    version: 2022.7.14-brescia-1
     
     # Set the python executable as entry point
     exec: usr/bin/python3.10
diff --git a/VERSION b/VERSION
index 86d321fe52d..999ca59fd6f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2022.7.14-brescia
\ No newline at end of file
+2022.7.14-brescia-1
\ No newline at end of file
diff --git a/data/com.usebottles.bottles.appdata.xml.in b/data/com.usebottles.bottles.appdata.xml.in
index b589cd1336d..7ddfbc35e38 100644
--- a/data/com.usebottles.bottles.appdata.xml.in
+++ b/data/com.usebottles.bottles.appdata.xml.in
@@ -96,7 +96,7 @@
       <display_length compare="ge">768</display_length>
     </requires>
     <releases>
-        <release version="2022.7.14-brescia" date="2022-07-14">
+        <release version="2022.7.14-brescia-1" date="2022-07-14">
           <description>
             <p>News</p>
             <ul>
diff --git a/debian/changelog b/debian/changelog
index c3d42a1431c..de3606d05b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-com.usebottles.bottles (2022.7.14-brescia) precise; urgency=low
+com.usebottles.bottles (2022.7.14-brescia-1) precise; urgency=low
 
   * Support for Steam runtimes (soldier, scout); if enabled, bottles with Proton use soldier while other runners use scout
   * Create Steam shortcuts directly from the program list; requires permission to the Steam path if Flatpak
diff --git a/meson.build b/meson.build
index d43bc62cada..133c84f6913 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project(
 	'bottles',
-	version: '2022.7.14-brescia',
+	version: '2022.7.14-brescia-1',
 	meson_version: '>= 0.50.0',
 	default_options: [
 		'warning_level=2',
diff --git a/src/backend/managers/conf.py b/src/backend/managers/conf.py
index 285da4f6505..1a9a376defe 100644
--- a/src/backend/managers/conf.py
+++ b/src/backend/managers/conf.py
@@ -6,7 +6,7 @@
 
 class ConfigManager(object):
 
-    def __init__(self, config_file: str = None, config_string: str = None, config_type: str = 'ini'):
+    def __init__(self, config_file: str = None, config_type: str = 'ini', config_string: str = None):
         self.config_file = config_file
         self.config_string = config_string
         self.config_type = config_type
diff --git a/src/backend/managers/installer.py b/src/backend/managers/installer.py
index a5563c43d4a..cd8721baf5e 100644
--- a/src/backend/managers/installer.py
+++ b/src/backend/managers/installer.py
@@ -289,7 +289,7 @@ def __step_update_config(config, step: dict):
             current_user = os.getenv("USER")
             conf_path = conf_path.replace("userdir/", f"drive_c/users/{current_user}/")
         conf_path = f"{bottle}/{conf_path}"
-        _conf = ConfigManager(conf_path, conf_type)
+        _conf = ConfigManager(config_file=conf_path, config_type=conf_type)
 
         for d in del_keys:
             _conf.del_key(d)
diff --git a/src/params.py b/src/params.py
index 93acf14b38e..47b91fff58b 100644
--- a/src/params.py
+++ b/src/params.py
@@ -2,8 +2,8 @@
 APP_NAME = "Bottles"
 APP_NAME_LOWER = APP_NAME.lower()
 APP_ID = "com.usebottles.bottles"
-VERSION = "2022.7.14-brescia"
-VERSION_NUM = "2022.7.14-brescia"
+VERSION = "2022.7.14-brescia-1"
+VERSION_NUM = "2022.7.14-brescia-1"
 
 # Internal settings not user editable
 ANIM_DURATION = 120
diff --git a/src/ui/about.ui b/src/ui/about.ui
index d553f84363e..f1ce81ba12d 100644
--- a/src/ui/about.ui
+++ b/src/ui/about.ui
@@ -4,7 +4,7 @@
   <object class="AdwAboutWindow" id="about_window">
     <property name="application-name">Bottles</property>
     <property name="modal">True</property>
-    <property name="version">2022.7.14-brescia</property>
+    <property name="version">2022.7.14-brescia-1</property>
     <property name="copyright" translatable="yes">© 2017-2022 - Bottles Developers</property>
     <property name="comments" translatable="yes">Easily manage wineprefix using environments</property>
     <property name="website">https://usebottles.com</property>