diff --git a/src/NDS.cpp b/src/NDS.cpp index 42b14416..2efb3b0a 100644 --- a/src/NDS.cpp +++ b/src/NDS.cpp @@ -895,7 +895,7 @@ void NDS::RunSystemSleep(u64 timestamp) param = evt.Param; EventFunc func = evt.Funcs[evt.FuncID]; - func(this, param); + func(evt.That, param); } } } diff --git a/src/frontend/qt_sdl/TitleManagerDialog.cpp b/src/frontend/qt_sdl/TitleManagerDialog.cpp index 30f29d24..fbff261c 100644 --- a/src/frontend/qt_sdl/TitleManagerDialog.cpp +++ b/src/frontend/qt_sdl/TitleManagerDialog.cpp @@ -119,6 +119,7 @@ void TitleManagerDialog::createTitleItem(u32 category, u32 titleid) // TODO: make it possible to select other languages? QString title = QString::fromUtf16(banner.EnglishTitle, 128); + title = title.left(title.indexOf('\0')); title.replace("\n", " ยท "); char gamecode[5];