From 3d92ff75f8d3aef404d0967382b8c7febc9ddf94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8E=AB=E6=AC=BA=E5=B0=91=E5=B9=B4=E7=A9=B7?=
 <jifusheng66336@163.com>
Date: Mon, 17 Aug 2020 09:48:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3modal=E5=87=BA=E6=9D=A5?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=AF=BC=E8=88=AA=E6=8E=A7=E5=88=B6=E7=84=B6?=
 =?UTF-8?q?=E5=90=8Epush=E5=88=B0=E5=85=B6=E4=BB=96Vc=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AEcrash=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                        |   2 ++
 WRNavigationBar_swift/.DS_Store                  | Bin 0 -> 6148 bytes
 .../xcshareddata/IDEWorkspaceChecks.plist        |   8 ++++++++
 .../WRNavigationBar/WRCustomNavigationBar.swift  |   2 +-
 4 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 WRNavigationBar_swift/.DS_Store
 create mode 100644 WRNavigationBar_swift/WRNavigationBar_swift.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

diff --git a/README.md b/README.md
index fa7f958..362381b 100644
--- a/README.md
+++ b/README.md
@@ -76,6 +76,8 @@ UIColor.defaultShadowImageHidden = true
 
 
 ## Update
+- **2020.08.17**
+解决问题：解决modal出来一个导航控制然后push到其他Vc，点击返回按钮crash的bug
 - **2017.12.09**
 解决问题：解决导航栏颜色和标题颜色改变失败的bug
 
diff --git a/WRNavigationBar_swift/.DS_Store b/WRNavigationBar_swift/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..da8f63501d810f857d89a01eed9513fdd8a353fc
GIT binary patch
literal 6148
zcmeHKu};H441HHR1i{de@tBd2`UfEj3j;!QU<BGiL9`?S3XJ&yzJ-6_SNIX0&sNo{
zuoVQzmh5-u*pBX<6vqHUF&%b+4uFg**jlIgMC7^XlC;dzCWchw5!V>u91ld7zrcXp
z-8N2ej6>er{QXt9MM2*kPH~SX-smOobr;VVa97cPLx0VP0WQX)Zf{UcYCZDK%WA4l
zs<P~lt3In`ukQ!h=JaiERh5U|RJp#IXW~c+aqA2?1J1zjVt_qcB->DQ>kK#p&cKWT
z`94IdU~bqbrcVb=8Ucv%8<~V_nI$AA8s>(LBA-x#rV=$Z*oYA{o&IQXxnZNI=?FG_
z1bcI^2_>YrvwlqB2)UwLXTTX)WMECV9qIr3U(f%GNxpLioPmGEKxmh}vfz=dw=Nw{
tdTpehQAH%KQJkf4ky<fhr4?^clh7Y!LCg&sMS3XyBamot;|%;L10QDwR!RT>

literal 0
HcmV?d00001

diff --git a/WRNavigationBar_swift/WRNavigationBar_swift.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/WRNavigationBar_swift/WRNavigationBar_swift.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/WRNavigationBar_swift/WRNavigationBar_swift.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/WRNavigationBar_swift/WRNavigationBar_swift/WRNavigationBar/WRCustomNavigationBar.swift b/WRNavigationBar_swift/WRNavigationBar_swift/WRNavigationBar/WRCustomNavigationBar.swift
index 5066e10..94b1be8 100644
--- a/WRNavigationBar_swift/WRNavigationBar_swift/WRNavigationBar/WRCustomNavigationBar.swift
+++ b/WRNavigationBar_swift/WRNavigationBar_swift/WRNavigationBar/WRCustomNavigationBar.swift
@@ -57,7 +57,7 @@ extension UIViewController
             return wr_currentViewController(from: tabBarController.selectedViewController!)
         }
         else if fromVC.presentedViewController != nil {
-            return wr_currentViewController(from:fromVC.presentingViewController!)
+            return wr_currentViewController(from:fromVC.presentedViewController!)
         }
         else {
             return fromVC