From 0cc289fa1cfcf3819ee0a519de61afca229a66d1 Mon Sep 17 00:00:00 2001 From: Brian Phlipot Date: Tue, 9 Aug 2022 07:08:24 -0600 Subject: [PATCH] More explicit RString creation to fix Windows build. --- src/ScreenEdit.cpp | 2 +- src/ThemeManager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp index 4b1f3f2714..59aea39d04 100644 --- a/src/ScreenEdit.cpp +++ b/src/ScreenEdit.cpp @@ -6078,7 +6078,7 @@ void ScreenEdit::HandleBGChangeChoice( BGChangeChoice c, const std::vector case global_movie_song_group_and_genre: { BGChangeChoice row2 = (BGChangeChoice)(file2_song_bganimation + iAnswers[file2_type]); - newChange.m_def.m_sFile2 = g_BackgroundChange.rows[row2].choices.empty() ? "" : g_BackgroundChange.rows[row2].choices[iAnswers[row2]]; + newChange.m_def.m_sFile2 = g_BackgroundChange.rows[row2].choices.empty() ? RString("") : g_BackgroundChange.rows[row2].choices[iAnswers[row2]]; } break; } diff --git a/src/ThemeManager.cpp b/src/ThemeManager.cpp index 04c7296e18..9967f909e9 100644 --- a/src/ThemeManager.cpp +++ b/src/ThemeManager.cpp @@ -505,7 +505,7 @@ void ThemeManager::RunLuaScripts( const RString &sMask, bool bUseThemeDir ) * scripts call GetThemeName(), it'll return the theme the script is in. */ m_sCurThemeName = iter->sThemeName; - const RString &sScriptDir = bUseThemeDir ? GetThemeDirFromName( m_sCurThemeName ) : "/"; + const RString &sScriptDir = bUseThemeDir ? GetThemeDirFromName( m_sCurThemeName ) : RString("/"); std::vector asElementPaths; // get files from directories