summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java/org
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2015-06-25 06:38:02 -0400
committerLioncash <mathew1800@gmail.com>2015-06-25 06:38:02 -0400
commit75006056f61c4e2ed53a12a4e846230b12919a9d (patch)
treef52c744845847a1f2408be922e1fc609b4ede15a /Source/Android/app/src/main/java/org
parent75a9740ab7b9014a8fad665b9f2cb602a4316dc7 (diff)
parente970f757d093ecf938626f82833a5f0358c0dadd (diff)
Merge pull request #2658 from sigmabeta/android-dont-crash
Android: Don't crash trying to hide toolbar in game.
Diffstat (limited to 'Source/Android/app/src/main/java/org')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
index b569785d35..d1e6f47273 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
@@ -1,8 +1,5 @@
package org.dolphinemu.dolphinemu.activities;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
@@ -69,12 +66,12 @@ public final class EmulationActivity extends AppCompatActivity
if (mSystemUiVisible)
{
- getActionBar().show();
+ getSupportActionBar().show();
hideSystemUiAfterDelay();
}
else
{
- getActionBar().hide();
+ getSupportActionBar().hide();
}
}
}