Wayland Display: Enabling Wayland display based on Environment Variable

Adding return to bool resolves the rdkshell crash issue when compiled with gcc 9.0 or higher.rdkcentral#54 Enabling wayland display when environment variable WAYLAND_DISPLAY is set otherwise it will use direct. Signed-off-by: balav08 <[email protected]>
balav08 · Jan 8, 2021 · 9e046b1 · 9e046b1
1 parent 618683b
commit 9e046b1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/compositorcontroller.cpp b/compositorcontroller.cpp
@@ -1133,6 +1133,7 @@ namespace RdkShell
                 gSplashImage->draw();
             }
         }
+        return true;
     }
 
     bool CompositorController::addAnimation(const std::string& client, double duration, std::map<std::string, RdkShellData> &animationProperties)

diff --git a/rdkshell.cpp b/rdkshell.cpp
@@ -295,21 +295,25 @@ namespace RdkShell
         }
         #endif
 
+        bool Iswayland = false;
+        char const *disp = getenv("WAYLAND_DISPLAY");
+        if (disp != 0) {
+                Iswayland = true; }	
         #ifdef RDKSHELL_ENABLE_FORCE_1080
         std::ifstream file720("/tmp/rdkshell720");
         if (file720.good())
         {
             std::cout << "!!!!! forcing 720 start!\n";
-            RdkShell::EssosInstance::instance()->initialize(false, 1280, 720);
+            RdkShell::EssosInstance::instance()->initialize(Iswayland, 1280, 720);
             gForce720 = true;
         }
         else
         {
             std::cout << "!!!!! forcing 1080 start!\n";
-            RdkShell::EssosInstance::instance()->initialize(false, 1920, 1080);
+            RdkShell::EssosInstance::instance()->initialize(Iswayland, 1920, 1080);
         }
         #else
-        RdkShell::EssosInstance::instance()->initialize(false);
+        RdkShell::EssosInstance::instance()->initialize(Iswayland);
         #endif //RDKSHELL_ENABLE_FORCE_1080
         glEnable(GL_BLEND);
         glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);