winenas: fix crash.

- return correct MM error code when no connection to server has been opened - don't close the AU driver if it hasn't been opened

winenas: fix crash.
65a1796b · Eric Pouech · Alexandre Julliard · 51862d44 · 65a1796b
Commit 65a1796b authored Dec 08, 2005 by Eric Pouech Committed by Alexandre Julliard Dec 08, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

audio.c dlls/winmm/winenas/audio.c +6 -3

No files found.
--- a/dlls/winmm/winenas/audio.c
+++ b/dlls/winmm/winenas/audio.c
@@ -407,7 +407,7 @@ LONG		NAS_WaveClose(void)
 LONG NAS_WaveInit(void)
 {
    int 	i;
-    nas_init();
+    if (!nas_init()) return MMSYSERR_ERROR;

    /* initialize all device handles to -1 */
    for (i = 0; i < MAX_WAVEOUTDRV; ++i)
@@ -1475,8 +1475,11 @@ static int nas_close(WINE_WAVEOUT* wwo)

 static int nas_end(void)
 {
-  AuCloseServer(AuServ);
-  AuServ = 0;
+  if (AuServ)
+  {
+    AuCloseServer(AuServ);
+    AuServ = 0;
+  }
  return 1;
 }