actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

More explicit RString creation to fix Windows build.

Browse Source
This commit is contained in:
Brian Phlipot
2022-10-03 16:21:19 -07:00
committed by teejusb
parent c1a3455ce4
commit 0cc289fa1c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenEdit.cpp
+1 -1
View File
@@ -6078,7 +6078,7 @@ void ScreenEdit::HandleBGChangeChoice( BGChangeChoice c, const std::vector<int>
case global_movie_song_group_and_genre: case global_movie_song_group_and_genre:
{ {
BGChangeChoice row2 = (BGChangeChoice)(file2_song_bganimation + iAnswers[file2_type]); 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; break;
} }
src/ThemeManager.cpp
+1 -1
View File
@@ -505,7 +505,7 @@ void ThemeManager::RunLuaScripts( const RString &sMask, bool bUseThemeDir )
* scripts call GetThemeName(), it'll return the theme the script is in. */ * scripts call GetThemeName(), it'll return the theme the script is in. */
m_sCurThemeName = iter->sThemeName; m_sCurThemeName = iter->sThemeName;
const RString &sScriptDir = bUseThemeDir ? GetThemeDirFromName( m_sCurThemeName ) : "/"; const RString &sScriptDir = bUseThemeDir ? GetThemeDirFromName( m_sCurThemeName ) : RString("/");
std::vector<RString> asElementPaths; std::vector<RString> asElementPaths;
// get files from directories // get files from directories