Fix Plasmashell crash when opening config

3 files changed, 111 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c744907623ca..a88923194d35 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = plasma5-applets-fanspeed-monitor-git
 	pkgdesc = Plasmoid for Plasma 5. Monitors temperature of existing sensors including CPU, GPU and HDD.
 	pkgver = r7.61be467
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/dwardor/plasma-applet-fanspeed-monitor
 	arch = any
 	license = GPL
@@ -12,7 +12,9 @@ pkgbase = plasma5-applets-fanspeed-monitor-git
 	provides = plasma5-applets-fanspeed-monitor
 	conflicts = plasma5-applets-fanspeed-monitor
 	source = git+https://github.com/dwardor/plasma-applet-fanspeed-monitor.git#branch=master
-	md5sums = SKIP
+	source = 0001-Fix-Plasmashell-crash-when-opening-config.patch
+	sha256sums = SKIP
+	sha256sums = f2e84c0201f401c04668f78e315530909d2f076460a2b553b6f4bdabdd411872
 
 pkgname = plasma5-applets-fanspeed-monitor-git
 
diff --git a/0001-Fix-Plasmashell-crash-when-opening-config.patch b/0001-Fix-Plasmashell-crash-when-opening-config.patch
new file mode 100644
index 000000000000..b9777a260d8f
--- /dev/null
+++ b/0001-Fix-Plasmashell-crash-when-opening-config.patch
@@ -0,0 +1,97 @@
+From b39300e49acd836865231374ddc1d849dcf8e8c2 Mon Sep 17 00:00:00 2001
+From: Zach Himsel <zach@himsel.net>
+Date: Mon, 29 Jun 2020 09:23:00 -0600
+Subject: [PATCH] Fix Plasmashell crash when opening config
+
+Written by /u/DGLS575 on Reddit
+https://www.reddit.com/r/kdeneon/comments/gkyuij/attempting_to_configure_thermal_monitor_widget/fuozkth/
+---
+ .../contents/ui/config/ConfigFanspeeds.qml    | 57 +++++++++----------
+ 1 file changed, 27 insertions(+), 30 deletions(-)
+
+diff --git a/package/contents/ui/config/ConfigFanspeeds.qml b/package/contents/ui/config/ConfigFanspeeds.qml
+index 51e30ed..3cf7570 100644
+--- a/package/contents/ui/config/ConfigFanspeeds.qml
++++ b/package/contents/ui/config/ConfigFanspeeds.qml
+@@ -326,26 +326,25 @@ Item {
+         connectedSources: [ 'nvidia-smi --query-gpu=fan.speed --format=csv,noheader' ]
+         
+         property bool prepared: false
+-        
+         onNewData: {
+-            nvidiaDS.connectedSources.length = 0
+-            
+-            if (data['exit code'] > 0) {
++            if (!prepared)
++            {
++                //nvidiaDS.connectedSources.length = 0
++                if (data['exit code'] > 0) {
++                    prepared = true
++                    return
++                }
++                
++                comboboxModel.append({
++                    text: 'nvidia-smi',
++                    val: 'nvidia-smi'
++                })
+                 prepared = true
+-                return
+             }
+-            
+-            comboboxModel.append({
+-                text: 'nvidia-smi',
+-                val: 'nvidia-smi'
+-            })
+-            
+-            prepared = true
+         }
+-        
+-        interval: 500
++        //interval: 500
+     }
+-    
++
+     PlasmaCore.DataSource {
+         id: atiDS
+         engine: 'executable'
+@@ -353,24 +352,22 @@ Item {
+         connectedSources: [ 'aticonfig --pplib-cmd "get fanspeed 0" | grep Result | sed -e "s/.*: *//" -e "s/%//"' ]
+         
+         property bool prepared: false
+-        
+         onNewData: {
+-            atiDS.connectedSources.length = 0
+-            
+-            if (data['exit code'] > 0) {
++            if (!prepared)
++            {
++                //atiDS.connectedSources.length = 0
++                if (data['exit code'] > 0) {
++                    prepared = true
++                    return
++                }
++                
++                comboboxModel.append({
++                    text: 'aticonfig',
++                    val: 'aticonfig'
++                })
+                 prepared = true
+-                return
+             }
+-            
+-            comboboxModel.append({
+-                text: 'aticonfig',
+-                val: 'aticonfig'
+-            })
+-            
+-            prepared = true
+         }
+-        
+-        interval: 500
++        //interval: 500
+     }
+-    
+ }
+-- 
+2.27.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 283f3b18ff4f..e88537e85dbf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=plasma5-applets-fanspeed-monitor-git
 _pkgname=${pkgname%-git}
 _repodir=plasma-applet-fanspeed-monitor
 pkgver=r7.61be467
-pkgrel=1
+pkgrel=2
 pkgdesc="Plasmoid for Plasma 5. Monitors temperature of existing sensors including CPU, GPU and HDD."
 arch=('any')
 url="https://github.com/dwardor/plasma-applet-fanspeed-monitor"
@@ -13,14 +13,21 @@ depends=('plasma-workspace' 'qt5-graphicaleffects')
 makedepends=('git' 'extra-cmake-modules')
 conflicts=("${_pkgname}")
 provides=("${_pkgname}")
-source=("git+https://github.com/dwardor/plasma-applet-fanspeed-monitor.git#branch=master")
-md5sums=('SKIP')
+source=("git+https://github.com/dwardor/plasma-applet-fanspeed-monitor.git#branch=master"
+        "0001-Fix-Plasmashell-crash-when-opening-config.patch")
+sha256sums=('SKIP'
+            'f2e84c0201f401c04668f78e315530909d2f076460a2b553b6f4bdabdd411872')
 
 pkgver() {
   cd "${_repodir}"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+    cd "${_repodir}"
+    patch -p1 -i ../0001-Fix-Plasmashell-crash-when-opening-config.patch
+}
+
 build() {
   cd "${_repodir}"