Improve code error handling of recent patch

ukui · Jul 21, 2020 · e216b4f · e216b4f
1 parent cd67121
commit e216b4f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,14 +4,14 @@ on:
   push:
     branches:
       - master
-    
+
   pull_request:
     branches:
       - master
 
   schedule:
     - cron: '0 0 * * *'
-  
+
 jobs:
   archlinux:
     name: on Archlinux
@@ -49,7 +49,7 @@ jobs:
           cd build;
           cmake ..;
           make -j$(nproc);
-  
+
   fedora:
     name: on Fedora 32
     runs-on: ubuntu-20.04

diff --git a/debian/copyright b/debian/copyright
@@ -48,6 +48,7 @@ Copyright: 2019 Tianjin KYLIN Information Technology Co., Ltd
 License: LGPL-2.1+
 
 Files: debian/*
+       .github/workflows/build.yml
 Copyright: 2019 Tianjin KYLIN Information Technology Co., Ltd
 License: LGPL-2.1+
 

diff --git a/tools/main.cpp b/tools/main.cpp
@@ -68,12 +68,17 @@ bool playShutdownMusic(UkuiPower &powermanager, int num)
 
 int main(int argc, char* argv[])
 {
-    Display *disp = XOpenDisplay(NULL);
-    Screen *scrn = DefaultScreenOfDisplay(disp);
-    if (NULL == scrn) {
-        return 0;
+    Display *display = XOpenDisplay(NULL);
+    if (NULL == display) {
+	qDebug() << "Can't open display!";
+	return -1;
     }
-    int width = scrn->width;
+    Screen *screen = DefaultScreenOfDisplay(display);
+    if (NULL == screen) {
+	qDebug() << "Get default screen failed!";
+        return -1;
+    }
+    int width = screen->width;
 
     if (width > 2560) {
         #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
@@ -82,6 +87,8 @@ int main(int argc, char* argv[])
         #endif
     }
 
+    XCloseDisplay(display);
+
     QApplication a(argc, argv);
     //for hidpi