diff --git a/src/nxemu-core/settings/identifiers.h b/src/nxemu-core/settings/identifiers.h index 18e51548..4897b235 100644 --- a/src/nxemu-core/settings/identifiers.h +++ b/src/nxemu-core/settings/identifiers.h @@ -6,6 +6,7 @@ enum class EmulationState : int32_t Stopped, Starting, LoadingRom, + RomLoaded, Running, Paused, Stopping, diff --git a/src/nxemu-loader/system_loader.cpp b/src/nxemu-loader/system_loader.cpp index d1a8510a..2b25b9ba 100644 --- a/src/nxemu-loader/system_loader.cpp +++ b/src/nxemu-loader/system_loader.cpp @@ -177,6 +177,7 @@ bool Systemloader::LoadRom(const char * fileName) return false; } + g_settings->SetInt(NXCoreSetting::EmulationState, (int32_t)EmulationState::RomLoaded); Loader::AppLoader * app_loader = impl->m_appLoader.get(); const LoaderFileType file_type = impl->m_appLoader->GetFileType(); if (file_type == LoaderFileType::Unknown || file_type == LoaderFileType::Error) diff --git a/src/nxemu/user_interface/sciter_main_window.cpp b/src/nxemu/user_interface/sciter_main_window.cpp index 239c5d59..14d3e0df 100644 --- a/src/nxemu/user_interface/sciter_main_window.cpp +++ b/src/nxemu/user_interface/sciter_main_window.cpp @@ -625,10 +625,9 @@ void SciterMainWindow::EmulationStateChanged(const char * /*setting*/, void * us SciterMainWindow * impl = (SciterMainWindow *)userData; EmulationState state = (EmulationState)SettingsStore::GetInstance().GetInt(NXCoreSetting::EmulationState); - if (state == EmulationState::LoadingRom) + if (state == EmulationState::RomLoaded) { impl->UpdateLoadingScreenDetails(); - impl->ApplyEmulationLoadingUi(); impl->m_shownFirstFrame = false; impl->ShowPanel(Panel::Loading); } diff --git a/src/nxemu/user_interface/sciter_main_window.h b/src/nxemu/user_interface/sciter_main_window.h index f5a6bad8..0e8637dd 100644 --- a/src/nxemu/user_interface/sciter_main_window.h +++ b/src/nxemu/user_interface/sciter_main_window.h @@ -123,9 +123,7 @@ private: void ResetWindowSize(uint32_t nominal_width, uint32_t nominal_height); #endif void LayoutRenderWindow(); - void UpdatePausePanel(); void UpdateLoadingScreenDetails(); - void ApplyEmulationLoadingUi(); void ShowPanel(Panel panel); void RefreshDiskCacheLoadingText(); void RegisterApplets(); diff --git a/src/nxemu/user_interface/settings/input_config_player.h b/src/nxemu/user_interface/settings/input_config_player.h index a855e30d..67e38611 100644 --- a/src/nxemu/user_interface/settings/input_config_player.h +++ b/src/nxemu/user_interface/settings/input_config_player.h @@ -103,4 +103,5 @@ private: PollingInputType m_pollingType; uint32_t m_pollingButtonId; std::vector> index_controller_type_pairs; + std::chrono::steady_clock::time_point m_stickUiThrottleLast; };