From d5078718a00282573e9d5aff7779dc5a326155a9 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Wed, 5 Oct 2011 23:47:49 +0200
Subject: [PATCH] Fix issue 667

---
 .../src/net/osmand/data/preparation/IndexCreator.java  |  4 ++--
 .../net/osmand/plus/activities/TestVoiceActivity.java  | 10 +++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/DataExtractionOSM/src/net/osmand/data/preparation/IndexCreator.java b/DataExtractionOSM/src/net/osmand/data/preparation/IndexCreator.java
index 9255d6e948..f96fc00f64 100644
--- a/DataExtractionOSM/src/net/osmand/data/preparation/IndexCreator.java
+++ b/DataExtractionOSM/src/net/osmand/data/preparation/IndexCreator.java
@@ -351,9 +351,9 @@ public class IndexCreator {
 	
 	public void generateIndexes(File readFile, IProgress progress, IOsmStorageFilter addFilter, MapZooms mapZooms,
 			MapRenderingTypes renderingTypes) throws IOException, SAXException, SQLException, InterruptedException {
-		if(LevelDBAccess.load()){
+//		if(LevelDBAccess.load()){
 //			dialect = DBDialect.NOSQL;
-		}
+//		}
 		
 		if (renderingTypes == null) {
 			renderingTypes = MapRenderingTypes.getDefault();
diff --git a/OsmAnd/src/net/osmand/plus/activities/TestVoiceActivity.java b/OsmAnd/src/net/osmand/plus/activities/TestVoiceActivity.java
index 43f7478e8a..c7d48311b6 100644
--- a/OsmAnd/src/net/osmand/plus/activities/TestVoiceActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/TestVoiceActivity.java
@@ -3,7 +3,6 @@
  */
 package net.osmand.plus.activities;
 
-import net.osmand.plus.R;
 import net.osmand.plus.voice.AbstractPrologCommandPlayer;
 import net.osmand.plus.voice.CommandBuilder;
 import net.osmand.plus.voice.CommandPlayer;
@@ -28,7 +27,6 @@ import android.widget.LinearLayout.LayoutParams;
 public class TestVoiceActivity extends Activity {
 
 
-	private CommandPlayer player;
 
 	@Override
 	public void onCreate(Bundle icicle) {
@@ -56,6 +54,8 @@ public class TestVoiceActivity extends Activity {
 				android.view.ViewGroup.LayoutParams.FILL_PARENT));
 		
 		// add buttons
+		setContentView(gl);
+		
 		new AsyncTask<Void, Void, CommandPlayer>() {
 
 			private ProgressDialog dlg;
@@ -63,7 +63,7 @@ public class TestVoiceActivity extends Activity {
 			@Override
 			protected void onPreExecute() {
 				super.onPreExecute();
-				dlg = ProgressDialog.show(app, "Loading", "Initializing voice player...", true, false); 
+				dlg = ProgressDialog.show(TestVoiceActivity.this, "Loading", "Initializing voice player...", true, false); 
 			}
 			@Override
 			protected CommandPlayer doInBackground(Void... params) {
@@ -85,10 +85,6 @@ public class TestVoiceActivity extends Activity {
 				}
 			}
 		}.execute((Void)null);
-		
-		
-		
-		setContentView(gl);
 	}
 	
 	private void addButtons(final LinearLayout ll, CommandPlayer p) {