summaryrefslogtreecommitdiffstats
path: root/src/common/resources/sndfile.cpp
diff options
context:
space:
mode:
authorkrzys-h <krzys_h@interia.pl>2014-08-06 12:27:17 +0200
committerkrzys-h <krzys_h@interia.pl>2014-08-06 12:27:17 +0200
commit0b2f25a6e3fda014b0f5a4282283fb90b0958d42 (patch)
tree110222c4e1dd4885e24d9c76257032106da68af3 /src/common/resources/sndfile.cpp
parent9a3cd67c3bb2f7d0d4b83f6a5ac8bbcfedf4207b (diff)
downloadcolobot-0b2f25a6e3fda014b0f5a4282283fb90b0958d42.tar.gz
colobot-0b2f25a6e3fda014b0f5a4282283fb90b0958d42.tar.bz2
colobot-0b2f25a6e3fda014b0f5a4282283fb90b0958d42.zip
Restored -datadir and -langdir arguments, added -savedir
Also, fixed some crashes when unable to open file
Diffstat (limited to 'src/common/resources/sndfile.cpp')
-rw-r--r--src/common/resources/sndfile.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/common/resources/sndfile.cpp b/src/common/resources/sndfile.cpp
index 9e8e729..3f5a60d 100644
--- a/src/common/resources/sndfile.cpp
+++ b/src/common/resources/sndfile.cpp
@@ -52,18 +52,17 @@ CSNDFile::~CSNDFile()
if (m_file)
{
PHYSFS_close(m_file);
- }
-
- if (m_snd_file)
- {
- sf_close(m_snd_file);
+ if (m_snd_file)
+ {
+ sf_close(m_snd_file);
+ }
}
}
bool CSNDFile::IsOpen()
{
- return m_snd_file;
+ return m_file && m_snd_file;
}