summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorRoman Masanin <36927roma@gmail.com>2020-09-13 20:45:42 +0200
committerRoman Masanin <36927roma@gmail.com>2020-09-13 20:45:42 +0200
commitaa2f1b6b294b74d87d7e6d9e21ed276011a417ca (patch)
tree3ad4f11fc033b721abf2d51553f83c91c0b3b8f4 /src/core
parentMerge pull request #698 from majesticCoding/miami (diff)
downloadre3-aa2f1b6b294b74d87d7e6d9e21ed276011a417ca.tar
re3-aa2f1b6b294b74d87d7e6d9e21ed276011a417ca.tar.gz
re3-aa2f1b6b294b74d87d7e6d9e21ed276011a417ca.tar.bz2
re3-aa2f1b6b294b74d87d7e6d9e21ed276011a417ca.tar.lz
re3-aa2f1b6b294b74d87d7e6d9e21ed276011a417ca.tar.xz
re3-aa2f1b6b294b74d87d7e6d9e21ed276011a417ca.tar.zst
re3-aa2f1b6b294b74d87d7e6d9e21ed276011a417ca.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Frontend.cpp18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index cdecb8b4..9c33d48a 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -1121,15 +1121,19 @@ CMenuManager::DrawStandardMenus(bool drawCurrScreen)
rightText = TheText.Get("FEA_ADP");
else {
char* provider = DMAudio.Get3DProviderName(m_nPrefsAudio3DProviderIndex);
-
- if (!strcmp(strupr(provider), "DIRECTSOUND3D HARDWARE SUPPORT")) {
- strcpy(provider, "DSOUND3D HARDWARE SUPPORT");
+ if (provider != NULL) {
+ if (!strcmp(strupr(provider), "DIRECTSOUND3D HARDWARE SUPPORT")) {
+ strcpy(provider, "DSOUND3D HARDWARE SUPPORT");
+ }
+ else if (!strcmp(strupr(provider), "DIRECTSOUND3D SOFTWARE EMULATION")) {
+ strcpy(provider, "DSOUND3D SOFTWARE EMULATION");
+ }
+ AsciiToUnicode(provider, unicodeTemp);
+ rightText = unicodeTemp;
}
- else if (!strcmp(strupr(provider), "DIRECTSOUND3D SOFTWARE EMULATION")) {
- strcpy(provider, "DSOUND3D SOFTWARE EMULATION");
+ else {
+ rightText = TheText.Get("not defined");
}
- AsciiToUnicode(provider, unicodeTemp);
- rightText = unicodeTemp;
}
break;
case MENUACTION_SPEAKERCONF: {