fixed uninitialized variables

cre4ture · Mar 18, 2013 · 662f3b0 · 662f3b0
1 parent 3d79ed4
commit 662f3b0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/definitionmanager.cpp b/definitionmanager.cpp
@@ -264,12 +264,12 @@ void DefinitionManager::installZip(QString path,bool overwrite,bool install)
 		JSONData *def;
 		try {
 			def=JSON::parse(zip.get(info->at("data")->at(i)->asString()));
+			delete def;
 		} catch (JSONParseException e) {
 			QMessageBox::warning(this,
 								 tr("Couldn't install %1").arg(path),
 								 tr("%1: %2").arg(info->at("data")->at(i)->asString(),e.reason),
 								 QMessageBox::Cancel);
-			delete def;
 			delete info;
 			zip.close();
 			return;

diff --git a/mapview.cpp b/mapview.cpp
@@ -365,7 +365,7 @@ void MapView::getToolTip(int x, int z)
 	int cz=floor(z/16.0);
 	Chunk *chunk=cache.fetch(cx,cz);
 	int offset=(x&0xf)+(z&0xf)*16;
-	int id,bd;
+	int id=0,bd=0;
 
 	QString name="Unknown";
 	QString biome="Unknown Biome";