fix bug with loading a queue that was previously uploading

NikhilNarayana · Mar 7, 2020 · fca7ced · fca7ced
1 parent f863dfc
commit fca7ced
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/meleeuploader/forms.py b/meleeuploader/forms.py
@@ -510,14 +510,14 @@ def __show_hview(self):
         self._hwin.show()
 
     def __add_to_qview(self, options):
-        self._qview += (options.p1, options.p2, " ".join((options.mprefix, options.mtype, options.msuffix)))
+        self._qview += (options.p1, options.p2, " ".join((options.mprefix, options.mmid, options.msuffix)))
         self._queue.put(options)
         self._qview.resize_rows_contents()
 
     def __update_qview(self, row, options):
         self._qview.set_value(0, row, options.p1)
         self._qview.set_value(1, row, options.p2)
-        self._qview.set_value(2, row, " ".join((options.mprefix, options.mtype, options.msuffix)))
+        self._qview.set_value(2, row, " ".join((options.mprefix, options.mmid, options.msuffix)))
         self._qview.resize_rows_contents()
 
     def __delete_from_queue_view(self, job_num):

diff --git a/meleeuploader/utils.py b/meleeuploader/utils.py
@@ -12,16 +12,16 @@
 
 
 def pre_upload(opts):
-    if opts.mtype == "Grand Finals" and any(x.lower() in opts.msuffix.lower() for x in ("Set 2", "Reset")):
+    if opts.mmid == "Grand Finals" and any(x.lower() in opts.msuffix.lower() for x in ("Set 2", "Reset")):
         opts.msuffix = ""
     opts.p1 = opts.p1.split("[L]")[0].strip()
     opts.p2 = opts.p2.split("[L]")[0].strip()
     if opts.mprefix and opts.msuffix:
-        opts.mtype = " ".join((opts.mprefix, opts.mtype, opts.msuffix))
+        opts.mtype = " ".join((opts.mprefix, opts.mmid, opts.msuffix))
     elif opts.mprefix:
-        opts.mtype = " ".join((opts.mprefix, opts.mtype))
+        opts.mtype = " ".join((opts.mprefix, opts.mmid))
     elif opts.msuffix:
-        opts.mtype = " ".join((opts.mtype, opts.msuffix))
+        opts.mtype = " ".join((opts.mmid, opts.msuffix))
     chars_exist = all(x for x in [opts.p1char, opts.p2char])
     title = make_title(opts, chars_exist)
     if len(title) > 100:

diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 from os import path
 
 here = path.abspath(path.dirname(__file__))
-version = '1.18.6'
+version = '1.18.7'
 
 long_des = ""
 with open(path.join(here, 'README.md')) as f: