aboutsummaryrefslogtreecommitdiff
path: root/morphos
diff options
context:
space:
mode:
authorRuediger Hanke2002-04-19 10:18:12 +0000
committerRuediger Hanke2002-04-19 10:18:12 +0000
commit8db88b342eb7f8746b4de0c3306f6727b4f4e598 (patch)
tree64eb610717110dad93c3638d94594cf275abb957 /morphos
parent2f5c7c135d60f65b9778e925247a0bc9c43dac0b (diff)
downloadscummvm-rg350-8db88b342eb7f8746b4de0c3306f6727b4f4e598.tar.gz
scummvm-rg350-8db88b342eb7f8746b4de0c3306f6727b4f4e598.tar.bz2
scummvm-rg350-8db88b342eb7f8746b4de0c3306f6727b4f4e598.zip
Fix freeze on exit bug when using MIDI music, removed no longer required headers
svn-id: r4003
Diffstat (limited to 'morphos')
-rw-r--r--morphos/morphos.cpp2
-rw-r--r--morphos/morphos_sound.cpp4
2 files changed, 1 insertions, 5 deletions
diff --git a/morphos/morphos.cpp b/morphos/morphos.cpp
index 487ecbd45f..98cedc1e2d 100644
--- a/morphos/morphos.cpp
+++ b/morphos/morphos.cpp
@@ -169,7 +169,7 @@ OSystem_MorphOS::~OSystem_MorphOS()
if( ScummMusicThread )
{
- Signal( (struct Task *)ScummMusicThread, SIGBREAKF_CTRL_F );
+ Signal( (struct Task *)ScummMusicThread, SIGBREAKF_CTRL_C );
ObtainSemaphore( &ScummMusicThreadRunning ); /* Wait for thread to finish */
ReleaseSemaphore( &ScummMusicThreadRunning );
}
diff --git a/morphos/morphos_sound.cpp b/morphos/morphos_sound.cpp
index c20631ef8f..67fa0ebaee 100644
--- a/morphos/morphos_sound.cpp
+++ b/morphos/morphos_sound.cpp
@@ -21,12 +21,8 @@
*
*/
-#include <devices/timer.h>
-
#include "stdafx.h"
#include "scumm.h"
-#include "mididrv.h"
-#include "imuse.h"
#include <dos/dos.h>
#include <exec/memory.h>