Merge lp:~afrantzis/powerd/fix-1486284-abort-during-shutdown into lp:powerd

[Alexandros Frantzis]

Fix crash during shutdown, caused by destroying an unjoined std::thread object (LP: #1486284)

Fix crash during shutdown, caused by destroying an unjoined std::thread object (LP: #1486284)

=== modified file 'debian/changelog'
--- debian/changelog	2016-01-11 13:34:19 +0000
+++ debian/changelog	2016-02-04 14:16:39 +0000
@@ -1,3 +1,10 @@
+powerd (0.16+16.04.20160204-0ubuntu1) xenial; urgency=medium
+
+  * Fix crash during shutdown, caused by destroying an unjoined
+    std::thread object (LP: #1486284)
+
+ -- Alexandros Frantzis <[e-mail]>  Thu, 04 Feb 2016 16:07:11 +0200
+
 powerd (0.16+16.04.20160111.1-0ubuntu1) xenial; urgency=medium
 
   [ CI Train Bot ]

=== modified file 'src/wakeup.cpp'
--- src/wakeup.cpp	2014-08-19 01:12:27 +0000
+++ src/wakeup.cpp	2016-02-04 14:16:39 +0000
@@ -152,6 +152,10 @@
 {
     requests.clear();
     reset_alarm_clock();
+    if (worker) {
+        worker->join();
+        worker.reset();
+    }
     g_clear_pointer(&hardware_alarm, u_hardware_alarm_unref);
 }