From 774312dee03e80aa757b50a5cfae8d20a3a3bc9e Mon Sep 17 00:00:00 2001
From: Dan Barber <github@danbarber.me>
Date: Sat, 2 Feb 2019 12:42:34 -0500
Subject: [PATCH] Initialize status

This also fixes an occasional crash seen on quitting the app.
---
 Persephone/Base.lproj/Main.storyboard |  4 ++--
 Persephone/MPDClient.swift            | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Persephone/Base.lproj/Main.storyboard b/Persephone/Base.lproj/Main.storyboard
index 8de9e69..8c2191f 100644
--- a/Persephone/Base.lproj/Main.storyboard
+++ b/Persephone/Base.lproj/Main.storyboard
@@ -716,9 +716,9 @@
                                 <toolbarItem implicitItemIdentifier="6D294101-04FF-4E2A-98A7-77A48E2296CD" label="" paletteLabel="" sizingBehavior="auto" id="FoD-o2-4f2">
                                     <nil key="toolTip"/>
                                     <textField key="view" horizontalHuggingPriority="251" verticalHuggingPriority="750" id="KVt-e7-7I5">
-                                        <rect key="frame" x="0.0" y="14" width="37" height="17"/>
+                                        <rect key="frame" x="0.0" y="14" width="72" height="17"/>
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="bCv-8Z-qfx">
+                                        <textFieldCell key="cell" lineBreakMode="clipping" title="stateLabel" id="bCv-8Z-qfx">
                                             <font key="font" usesAppearanceFont="YES"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
diff --git a/Persephone/MPDClient.swift b/Persephone/MPDClient.swift
index da63f3d..d828e9e 100644
--- a/Persephone/MPDClient.swift
+++ b/Persephone/MPDClient.swift
@@ -50,18 +50,26 @@ class MPDClient {
 
     self.connection = connection
     self.status = status
+    self.initializeStatus()
     idle()
   }
 
   func disconnect() {
-    mpd_status_free(status)
-    mpd_connection_free(connection)
+    noIdle()
+    commandQueue.async { [unowned self] in
+      mpd_status_free(self.status)
+      mpd_connection_free(self.connection)
+    }
   }
 
   func fetchStatus() {
     sendCommand(command: .fetchStatus)
   }
 
+  func initializeStatus() {
+    self.delegate?.didUpdateState(mpdClient: self, state: self.getState())
+  }
+
   func getState() -> State {
     let state = mpd_status_get_state(status)
     return State(rawValue: state.rawValue)!