Merge branch 'upupstream-master' into jtg/solar-sensor-no-rom

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);
                 }
             }
         }

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];