From add09bef07b6da9f73403bf0aeaf13c0157ab082 Mon Sep 17 00:00:00 2001 From: Kyzentun Keeslala Date: Thu, 22 Oct 2015 00:04:13 -0600 Subject: [PATCH] Added metrics for ScreenMiniMenuTimingDataChangeInformation that dbk2 found were missing. Changed ASSERT in AddNewScreenTop to ASSERT_M. --- Themes/_fallback/metrics.ini | 3 +++ src/ScreenManager.cpp | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index c29cfb986a..c412c0d0a5 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -4279,6 +4279,9 @@ Fallback="ScreenMiniMenu" [ScreenMiniMenuTimingDataInformation] Fallback="ScreenMiniMenu" +[ScreenMiniMenuTimingDataChangeInformation] +Fallback="ScreenMiniMenu" + [ScreenMiniMenuBackgroundChange] Fallback="ScreenMiniMenu" diff --git a/src/ScreenManager.cpp b/src/ScreenManager.cpp index 403d1acd7c..f9e4555ae4 100644 --- a/src/ScreenManager.cpp +++ b/src/ScreenManager.cpp @@ -773,8 +773,8 @@ void ScreenManager::AddNewScreenToTop( const RString &sScreenName, ScreenMessage // Find the prepped screen. LoadedScreen ls; - bool b = GetPreppedScreen( sScreenName, ls ); - ASSERT( b ); + bool screen_load_success = GetPreppedScreen( sScreenName, ls ); + ASSERT_M(screen_load_success, ssprintf("ScreenManager::AddNewScreenToTop: Failed to load screen %s", sScreenName.c_str())); ls.m_SendOnPop = SendOnPop;