Fix a critical bug on CotEditor 3.1.0 + macOS 10.12.1 (#640)

coteditor · Nov 17, 2016 · df5465f · df5465f
1 parent 8d11ee1
commit df5465f
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,15 @@
 Change Log
 ==========================
 
+develop
+--------------------------
+
+### Fixes
+
+- Fix a critical issue on CotEditor 3.1.0 where documents can't be opened under some specific environments.
+
+
+
 3.1.0 (172)
 --------------------------
 

diff --git a/CotEditor/CotEditor -AppStore-Info.plist b/CotEditor/CotEditor -AppStore-Info.plist
@@ -945,11 +945,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.0</string>
+	<string>3.1.1-alpha</string>
 	<key>CFBundleSignature</key>
 	<string>cEd1</string>
 	<key>CFBundleVersion</key>
-	<string>172</string>
+	<string>173</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/CotEditor/CotEditor-Info.plist b/CotEditor/CotEditor-Info.plist
@@ -945,11 +945,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.0</string>
+	<string>3.1.1-alpha</string>
 	<key>CFBundleSignature</key>
 	<string>cEd1</string>
 	<key>CFBundleVersion</key>
-	<string>172</string>
+	<string>173</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/CotEditor.helpindex b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/CotEditor.helpindex
diff --git a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/releasenotes.html b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/releasenotes.html
@@ -24,11 +24,28 @@ <h1>Release Notes</h1>
 
 <article>
 <header>
-	<h1>CotEditor 3.1.0</h1>
+	<h1>CotEditor 3.1.1</h1>
 	<p>release: <time>2016-11</time></p>
 </header>
 
 
+<section>
+<h3>Fixes</h3>
+
+<ul>
+	<li>Fix a critical issue on CotEditor 3.1.0 where documents can't be opened under some specific environments.</li>
+</ul>
+</section>
+</article>
+
+
+<article>
+<header>
+	<h1>CotEditor 3.1.0</h1>
+	<p>release: <time>2016-11-17</time></p>
+</header>
+
+
 <section>
 <h3>New Features</h3>
 

diff --git a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/CotEditor.helpindex b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/CotEditor.helpindex
diff --git a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/releasenotes.html b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/releasenotes.html
@@ -24,11 +24,28 @@ <h1>リリースノート</h1>
 
 <article>
 <header>
-	<h1>CotEditor 3.1.0</h1>
+	<h1>CotEditor 3.1.1</h1>
 	<p>リリース: <time>2016-11</time></p>
 </header>
 
 
+<section>
+<h2>修正</h2>
+
+<ul>
+	<li>特定の環境下で、CotEditor 3.1.0 で書類が開けないクリティカルな不具合を修正</li>
+</ul>
+</section>
+</article>
+
+
+<article>
+<header>
+	<h1>CotEditor 3.1.0</h1>
+	<p>リリース: <time>2016-11-17</time></p>
+</header>
+
+
 <section>
 <h2>新機能</h2>
 

diff --git a/CotEditor/Sources/AppDelegate.swift b/CotEditor/Sources/AppDelegate.swift
@@ -145,7 +145,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         NSApp.servicesProvider = ServicesProvider()
 
         // setup touchbar
-        if #available(macOS 10.12.1, *) {
+        if #available(macOS 10.12.1, *), NSClassFromString("NSTouchBar") != nil {
             NSApp.isAutomaticCustomizeTouchBarMenuItemEnabled = true
         }
 

diff --git a/CotEditor/Sources/DocumentViewController.swift b/CotEditor/Sources/DocumentViewController.swift
@@ -438,7 +438,7 @@ final class DocumentViewController: NSSplitViewController, SyntaxStyleDelegate,
                 viewController.textView?.wrapsLines = wrapsLines
             }
 
-            if #available(OSX 10.12.1, *) {
+            if #available(macOS 10.12.1, *), NSClassFromString("NSTouchBar") != nil {
                 self.validateTouchBarItem(identifier: .wrapLines)
             }
         }
@@ -464,7 +464,7 @@ final class DocumentViewController: NSSplitViewController, SyntaxStyleDelegate,
                 viewController.textView?.showsInvisibles = showsInvisibles
             }
 
-            if #available(OSX 10.12.1, *) {
+            if #available(macOS 10.12.1, *), NSClassFromString("NSTouchBar") != nil {
                 self.validateTouchBarItem(identifier: .invisibles)
             }
         }

diff --git a/CotEditor/Sources/EditorTextViewController.swift b/CotEditor/Sources/EditorTextViewController.swift
@@ -41,7 +41,7 @@ final class EditorTextViewController: NSViewController, NSTextViewDelegate {
             textView.blockCommentDelimiters = syntaxStyle?.blockCommentDelimiters
             textView.firstSyntaxCompletionCharacterSet = syntaxStyle?.firstCompletionCharacterSet
 
-            if #available(OSX 10.12.1, *) {
+            if #available(macOS 10.12.1, *), NSClassFromString("NSTouchBar") != nil {
                 textView.validateTouchBarItem(identifier: .comment)
             }
         }