Work around deadlock when calling xbmc.executebuildin(Reboot)

LibreELEC · Jan 16, 2021 · 5a63da8 · 5a63da8
1 parent 9557255
commit 5a63da8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/resources/lib/modules/system.py b/resources/lib/modules/system.py
@@ -15,6 +15,7 @@
 import tarfile
 import oeWindows
 from xml.dom import minidom
+import subprocess
 
 xbmcDialog = xbmcgui.Dialog()
 
@@ -393,15 +394,15 @@ def reset_xbmc(self, listItem=None):
             open(self.XBMC_RESET_FILE, 'a').close()
             oe.winOeMain.close()
             oe.xbmcm.waitForAbort(1)
-            xbmc.executebuiltin('Reboot')
+            subprocess.call(['/usr/bin/systemctl', '--no-block', 'reboot'], close_fds=True)
 
     @log.log_function()
     def reset_oe(self, listItem=None):
         if self.ask_sure_reset('Hard') == 1:
             open(self.LIBREELEC_RESET_FILE, 'a').close()
             oe.winOeMain.close()
             oe.xbmcm.waitForAbort(1)
-            xbmc.executebuiltin('Reboot')
+            subprocess.call(['/usr/bin/systemctl', '--no-block', 'reboot'], close_fds=True)
 
     @log.log_function()
     def ask_sure_reset(self, part):
@@ -492,7 +493,7 @@ def do_restore(self, listItem=None):
                     if oe.reboot_counter(10, oe._(32371)) == 1:
                         oe.winOeMain.close()
                         oe.xbmcm.waitForAbort(1)
-                        xbmc.executebuiltin('Reboot')
+                        subprocess.call(['/usr/bin/systemctl', '--no-block', 'reboot'], close_fds=True)
                 else:
                     log.log('User Abort!')
                     oe.execute(f'rm -rf {self.RESTORE_DIR}')

diff --git a/resources/lib/modules/updates.py b/resources/lib/modules/updates.py
@@ -502,7 +502,7 @@ def do_autoupdate(self, listItem=None, silent=False):
                 if silent == False:
                     oe.winOeMain.close()
                     oe.xbmcm.waitForAbort(1)
-                    xbmc.executebuiltin('Reboot')
+                    subprocess.call(['/usr/bin/systemctl', '--no-block', 'reboot'], close_fds=True)
             else:
                 delattr(self, 'update_in_progress')