More explicit RString creation to fix Windows build.
This commit is contained in:
+1
-1
@@ -6078,7 +6078,7 @@ void ScreenEdit::HandleBGChangeChoice( BGChangeChoice c, const std::vector<int>
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -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<RString> asElementPaths;
|
||||
// get files from directories
|
||||
|
||||
Reference in New Issue
Block a user