Trying to fix crash when hiding git panel

cc libgit2/objective-git#690
arguiot · May 16, 2019 · 1e67956 · 1e67956
1 parent 2e06e23
commit 1e67956
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/StudIO/Editor/Controllers/GitCommit.swift b/StudIO/Editor/Controllers/GitCommit.swift
@@ -90,8 +90,13 @@ class GitCommit: UIView {
 
     func reloadProperties() {
         DispatchQueue.global().async {
+            self.status = []
+
             guard let rsg2 = self.repo?.pointer else { return }
+
             let r = GTRepository(gitRepository: rsg2)
+
+            guard nil != r?.fileURL else { return }
             do {
                 try r?.enumerateFileStatus(options: nil, usingBlock: { (delta1, delta2, val) in
                     if delta2?.status != GTDeltaType.unmodified {

diff --git a/StudIO/Editor/WorkingDirDetailVC.swift b/StudIO/Editor/WorkingDirDetailVC.swift
@@ -160,7 +160,10 @@ class WorkingDirDetailVC: UIViewController {
         save()
 
         let p = editorView?.gitPanel
-        p?.reloadProperties()
+
+        if p?.isHidden == true {
+            p?.reloadProperties()
+        }
         p?.isHidden = !(p?.isHidden ?? false)
 
     }

diff --git a/StudIO/Info.plist b/StudIO/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>827</string>
+	<string>830</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>LSSupportsOpeningDocumentsInPlace</key>