From a0cf3d22ee77605b2511ac944b5906831968eb25 Mon Sep 17 00:00:00 2001
From: Kevin Richter <me@kevinrichter.nl>
Date: Sun, 18 Jan 2015 22:01:49 +0100
Subject: [PATCH] Fixed back button in thread activity

---
 .../org/floens/chan/ui/activity/ChanActivity.java     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java
index a054ac31..9691a22e 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java
@@ -37,6 +37,7 @@ import android.view.ViewGroup.LayoutParams;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.FrameLayout;
+import android.widget.ListView;
 import android.widget.Spinner;
 import android.widget.TextView;
 
@@ -201,10 +202,14 @@ public class ChanActivity extends BaseActivity implements AdapterView.OnItemSele
 
     @Override
     public void onBackPressed() {
-        if (threadPane.isOpen()) {
-            super.onBackPressed();
+        if(pinDrawer.isDrawerOpen(pinDrawerView)) {
+            pinDrawer.closeDrawer(pinDrawerView);
         } else {
-            threadPane.openPane();
+            if (threadPane.isOpen()) {
+                super.onBackPressed();
+            } else {
+                threadPane.openPane();
+            }
         }
     }