Fix music playing in the editor

This commit is contained in:
elasota
2021-03-06 11:34:47 -05:00
parent c981a97a20
commit 6715bcb030

View File

@@ -637,7 +637,7 @@ void HandleSoundMusicChange (short newVolume, Boolean sayIt)
isSoundOn = (newVolume != 0); isSoundOn = (newVolume != 0);
if (wasIdle) if (wasIdle && theMode != kEditMode)
{ {
if (newVolume == 0) if (newVolume == 0)
StopTheMusic(); StopTheMusic();
@@ -773,7 +773,7 @@ void DoSoundPrefs (void)
case kCancelButton: case kCancelButton:
UnivSetSoundVolume(wasLoudness, thisMac.hasSM3); UnivSetSoundVolume(wasLoudness, thisMac.hasSM3);
HandleSoundMusicChange(wasLoudness, false); HandleSoundMusicChange(wasLoudness, false);
if (isPlayMusicIdle != wasIdle) if (isPlayMusicIdle != wasIdle && theMode != kEditMode)
{ {
if (isPlayMusicIdle) if (isPlayMusicIdle)
{ {
@@ -831,7 +831,7 @@ void DoSoundPrefs (void)
case kIdleMusicItem: case kIdleMusicItem:
wasIdle = !wasIdle; wasIdle = !wasIdle;
SetDialogItemValue(prefDlg, kIdleMusicItem, (short)wasIdle); SetDialogItemValue(prefDlg, kIdleMusicItem, (short)wasIdle);
if (wasIdle) if (wasIdle && theMode != kEditMode)
{ {
UnivGetSoundVolume(&tempVolume, thisMac.hasSM3); UnivGetSoundVolume(&tempVolume, thisMac.hasSM3);
if (tempVolume != 0) if (tempVolume != 0)