diff --git a/src/m64py/frontend/dialogs.py b/src/m64py/frontend/dialogs.py index f4b2850..4e3d124 100644 --- a/src/m64py/frontend/dialogs.py +++ b/src/m64py/frontend/dialogs.py @@ -27,10 +27,13 @@ class AboutDialog(QDialog, Ui_AboutDialog): def __init__(self, parent): QDialog.__init__(self, parent) self.setupUi(self) + if parent.worker.m64p.core_version != "Unknown": + version = version_split(parent.worker.m64p.core_version) + else: + version = "Unknown" text = self.labelAbout.text() text = text.replace("FRONTEND_VERSION", FRONTEND_VERSION) - text = text.replace("CORE_VERSION", - version_split(parent.worker.m64p.core_version)) + text = text.replace("CORE_VERSION", version) self.labelAbout.setText(text) self.show() diff --git a/src/m64py/frontend/keymap.py b/src/m64py/frontend/keymap.py index 63a4fc9..383696e 100644 --- a/src/m64py/frontend/keymap.py +++ b/src/m64py/frontend/keymap.py @@ -16,8 +16,7 @@ from PyQt4.QtCore import Qt -from m64py.SDL.constants import * -from m64py.SDL2.scancode import * +from m64py.frontend.keycodes import * QT2SDL = {} QT2SDL2 = {} diff --git a/src/m64py/frontend/romlist.py b/src/m64py/frontend/romlist.py index a5fdb04..90e6c86 100644 --- a/src/m64py/frontend/romlist.py +++ b/src/m64py/frontend/romlist.py @@ -144,8 +144,8 @@ class ROMList(QMainWindow, Ui_ROMList): def refresh_items(self): """Refreshes available ROMs list""" - path_roms = self.qset.value("Paths/ROM") - if not path_roms: + path_roms = str(self.qset.value("Paths/ROM")) + if not path_roms or path_roms == "None": self.parent.emit(SIGNAL( "info_dialog(PyQt_PyObject)"), "ROMs directory not found.")