AURORA: Use ScopedPtr in SSFFile

xoreos · Oct 26, 2016 · 58a6176 · 58a6176
1 parent d0ae588
commit 58a6176
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/src/aurora/ssffile.cpp b/src/aurora/ssffile.cpp
@@ -26,6 +26,7 @@
  * (<https://github.com/xoreos/xoreos-docs/tree/master/specs/bioware>)
  */
 
+#include "src/common/scopedptr.h"
 #include "src/common/readstream.h"
 #include "src/common/writestream.h"
 #include "src/common/writefile.h"
@@ -55,18 +56,11 @@ SSFFile::SSFFile(Common::SeekableReadStream &ssf) {
 }
 
 SSFFile::SSFFile(const Common::UString &ssf) {
-	Common::SeekableReadStream *res = ResMan.getResource(ssf, kFileTypeSSF);
+	Common::ScopedPtr<Common::SeekableReadStream> res(ResMan.getResource(ssf, kFileTypeSSF));
 	if (!res)
 		throw Common::Exception("No such SSF \"%s\"", ssf.c_str());
 
-	try {
-		load(*res);
-	} catch (...) {
-		delete res;
-		throw;
-	}
-
-	delete res;
+	load(*res);
 }
 
 SSFFile::~SSFFile() {