Merge pull request #105 from alvanson/stabilize

Fix stability issues

fofix/core/Theme.py

@@ -1060,6 +1060,7 @@ def renderUnselectedItem(self, scene, i, n):
         w, h = scene.geometry
         font = scene.fontDict['songListFont']
         lfont = scene.fontDict['songListFont']
+        notesTotal, notesHit, noteStreak = -1, 0, 0
         if self.setlist_type == 0:
             return
         elif self.setlist_type == 1:
@@ -1370,6 +1371,7 @@ def renderSelectedItem(self, scene, n):
         lfont = scene.fontDict['songListFont']
         sfont = scene.fontDict['shadowFont']
         item = scene.selectedItem
+        notesTotal, notesHit, noteStreak = -1, 0, 0
         if not item:
             return
         if isinstance(item, song.BlankSpaceInfo):

fofix/game/Menu.py

@@ -37,6 +37,7 @@
 from fofix.core.View import Layer
 from fofix.core import Player
 from fofix.core import Data
+from fofix.core.constants import *
 
 class Choice:
     def __init__(self, text, callback, name = None, values = None, valueIndex = 0, append_submenu_char = True, tipText = None):

fofix/game/song/song.py

@@ -2929,7 +2929,7 @@ def loadSong(engine, name, library=DEFAULT_LIBRARY, playbackOnly=False, notesOnl
         # escape all characters that cause the problem. For now the change dir
         # method is a cleaner work around than reimpplementing that function here.
         orgpath = os.path.abspath('.')
-        os.chdir("{1}{0}{2}{0}".format(os.path.sep, library, name))
+        os.chdir(engine.resource.fileName(library, name))
         songOggFiles = glob.glob('*.ogg')
 
         os.chdir(orgpath)