some drunk fixes

3 files changed, 9 insertions, 6 deletions

diff --git a/Juick/LaunchScreen.storyboard b/Juick/LaunchScreen.storyboard
index e0a196b..be5fe7e 100644
--- a/Juick/LaunchScreen.storyboard
+++ b/Juick/LaunchScreen.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -25,8 +25,8 @@
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="D5d-4R-c9b" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="Tmo-sv-3CG"/>
-                            <constraint firstItem="D5d-4R-c9b" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="k0r-L6-uBV"/>
+                            <constraint firstItem="D5d-4R-c9b" firstAttribute="centerX" secondItem="Bcu-3y-fUS" secondAttribute="centerX" id="Tmo-sv-3CG"/>
+                            <constraint firstItem="D5d-4R-c9b" firstAttribute="centerY" secondItem="Bcu-3y-fUS" secondAttribute="centerY" constant="-10" id="k0r-L6-uBV"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
                     </view>
diff --git a/Juick/Supporting Files/Juick-Info.plist b/Juick/Supporting Files/Juick-Info.plist
index f544bf8..1415672 100644
--- a/Juick/Supporting Files/Juick-Info.plist
+++ b/Juick/Supporting Files/Juick-Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.29</string>
+	<string>1.0.31</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>
diff --git a/Juick/ViewControllers/DiscoverViewController.m b/Juick/ViewControllers/DiscoverViewController.m
index 3822643..4a36cfe 100644
--- a/Juick/ViewControllers/DiscoverViewController.m
+++ b/Juick/ViewControllers/DiscoverViewController.m
@@ -23,7 +23,9 @@ AppDelegate *appDelegate;
 -(void) viewDidLoad {
     [super viewDidLoad];
     appDelegate = (AppDelegate *) [UIApplication sharedApplication].delegate;
-    [self performSegueWithIdentifier:@"threadViewSegue" sender:self];
+    if (appDelegate.pushedThread != nil) {
+        [self performSegueWithIdentifier:@"threadViewSegue" sender:self];
+    }
 }
 
 -(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
@@ -37,6 +39,7 @@ AppDelegate *appDelegate;
         NSNumber *mid;
         if (appDelegate.pushedThread != nil) {
             mid = appDelegate.pushedThread;
+            appDelegate.pushedThread = nil;
         } else {
             Message *msg = [self.messages objectAtIndex:[self.tableView indexPathForSelectedRow].row];
             mid = msg.mid;