[Scummvm-git-logs] scummvm master -> f45e3184ba6d90612c7a97a4ae17dbb61c063cc8

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f45e3184ba SYMBIAN: Fix wrong command order


Commit: f45e3184ba6d90612c7a97a4ae17dbb61c063cc8
    https://github.com/scummvm/scummvm/commit/f45e3184ba6d90612c7a97a4ae17dbb61c063cc8
Author: Fiodar Stryzhniou (fedor_qd at mail.ru)
Date: 2021-08-18T14:09:16+03:00

Commit Message:
SYMBIAN: Fix wrong command order

Changed paths:
    backends/platform/symbian/symbian_builder/build_apps.py
    backends/platform/symbian/symbian_builder/piper.py


diff --git a/backends/platform/symbian/symbian_builder/build_apps.py b/backends/platform/symbian/symbian_builder/build_apps.py
index 706b6df453..3ad3728dd2 100644
--- a/backends/platform/symbian/symbian_builder/build_apps.py
+++ b/backends/platform/symbian/symbian_builder/build_apps.py
@@ -80,15 +80,17 @@ def thread_func(q, plats):
       print "Target %s done!" %fileName
 
 def build_apps(plats):
-   q = Queue.Queue()
-   t_count = mp.cpu_count() + 2
-   if t_count > q.qsize():
-      t_count = q.qsize()
    fileNames = os.listdir(plats)
    fileNames = [x for x in fileNames if ".mmp" in x]
 
+   q = Queue.Queue()
    for fileName in fileNames:
       q.put(fileName)
+
+   t_count = mp.cpu_count() + 2
+   if t_count > q.qsize():
+      t_count = q.qsize()
+
    print "Queue size: %s" %q.qsize()
    print "Thread count: %s" %t_count
    threads = [threading.Thread(target=thread_func, args=(q, plats)) for i in range(t_count)]
diff --git a/backends/platform/symbian/symbian_builder/piper.py b/backends/platform/symbian/symbian_builder/piper.py
index 46deff73eb..dd3eea0377 100644
--- a/backends/platform/symbian/symbian_builder/piper.py
+++ b/backends/platform/symbian/symbian_builder/piper.py
@@ -81,10 +81,6 @@ def thread_func(q):
       print "Engine %s done!" %fileName
 
 def build_mmp(try_fix = False):
-   q = Queue.Queue()
-   t_count = mp.cpu_count() + 2
-   if t_count > q.qsize():
-      t_count = q.qsize()
    fileNames = os.listdir(mmps)
    fileNames = [x for x in fileNames if ".mmp" in x]
    if try_fix:
@@ -93,8 +89,14 @@ def build_mmp(try_fix = False):
    else:
       SafeWriteFile(os.path.join(mmps, whitelist), fileNames)
 
+   q = Queue.Queue()
    for fileName in fileNames:
       q.put(fileName)
+
+   t_count = mp.cpu_count() + 2
+   if t_count > q.qsize():
+      t_count = q.qsize()
+
    print "Queue size: %s" %q.qsize()
    print "Thread count: %s" %t_count
    threads = [threading.Thread(target=thread_func, args=(q, )) for i in range(t_count)]