Mercurial > audlegacy-plugins

diff src/adplug/core/rix.cxx @ 953:ae7e96e44f22 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] Now in sync with AdPlug upstream, merging their commit: "Removed superfluous exit() call. This was detected as part of a GCC 4.3 compilation regression test. Thanks to Martin Michlmayr! Fixes Debian bug #417078."
author chainsaw
date Fri, 13 Apr 2007 09:27:41 -0700
parents cae46214b8bf
children 4709ce4e209e
line wrap: on
line diff
--- a/src/adplug/core/rix.cxx	Fri Apr 13 09:09:50 2007 -0700
+++ b/src/adplug/core/rix.cxx	Fri Apr 13 09:27:41 2007 -0700
@@ -1,6 +1,6 @@
 /*
  * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2006 Simon Peter, <dn.tlp@gmx.net>, et al.
+ * Copyright (C) 1999 - 2007 Simon Peter, <dn.tlp@gmx.net>, et al.
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -134,6 +134,7 @@
   set_new_int();
   data_initial();
 }
+
 unsigned int CrixPlayer::getsubsongs()
 {
 	if(flag_mkf)
@@ -157,7 +158,8 @@
 /*------------------Implemention----------------------------*/
 inline void CrixPlayer::set_new_int()
 {
-  if(!ad_initial()) exit(1);
+//   if(!ad_initial()) exit(1);
+  ad_initial();
 }
 /*----------------------------------------------------------*/
 inline void CrixPlayer::Pause()