From 63469d12beeb2ddec87e9bd20b96b0959aeda91e Mon Sep 17 00:00:00 2001
From: dhk2 <donkimberlin@hotmail.com>
Date: Fri, 3 Jul 2020 16:15:15 -0700
Subject: [PATCH] Trying to assuage gits conflict adverse attitude

---
 .../java/net/schueller/peertube/activity/VideoPlayActivity.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java b/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
index 71b8924..479b5ea 100644
--- a/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
@@ -140,6 +140,7 @@ public class VideoPlayActivity extends AppCompatActivity {
         registerReceiver(receiver, filter);
 
         Log.v(TAG, "switched to pip ");
+        floatMode=true;
         //     videoPlayerFragment.useController(false);
     }
     public void changedToNormalMode(){
@@ -151,6 +152,7 @@ public class VideoPlayActivity extends AppCompatActivity {
             unregisterReceiver(receiver);
         }
         Log.v(TAG,"switched to normal");
+        floatMode=false;
         //          videoPlayerFragment.useController(true);
     }
     @Override