flutter_package / fluttertpc_get

Go to a project
Toggle navigation Toggle navigation pinning
Jonny Borges
Committed by GitHub
e00b7c81 2 parents 423cba28 1c64098d

Merge pull request #766 from 4mb1t/master 

Fix incorrect Get.reference when pop route
Inline Side-by-side
Showing 1 changed file with 9 additions and 8 deletions
@@ -127,14 +127,15 @@ class GetObserver extends NavigatorObserver { @@ -127,14 +127,15 @@ class GetObserver extends NavigatorObserver {
127 @override 127 @override
128 void didPop(Route route, Route previousRoute) { 128 void didPop(Route route, Route previousRoute) {
129 super.didPop(route, previousRoute); 129 super.didPop(route, previousRoute);
130 - final newRoute = _RouteData.ofRoute(route);  
131 -  
132 - if (newRoute.isSnackbar) {  
133 - Get.log("CLOSE SNACKBAR ${newRoute.name}");  
134 - } else if (newRoute.isBottomSheet || newRoute.isDialog) {  
135 - Get.log("CLOSE ${newRoute.name}");  
136 - } else if (newRoute.isGetPageRoute) {  
137 - Get.log("CLOSE TO ROUTE ${newRoute.name}"); 130 + final currentRoute = _RouteData.ofRoute(route);
  131 + final newRoute = _RouteData.ofRoute(previousRoute);
  132 +
  133 + if (currentRoute.isSnackbar) {
  134 + Get.log("CLOSE SNACKBAR ${currentRoute.name}");
  135 + } else if (currentRoute.isBottomSheet || currentRoute.isDialog) {
  136 + Get.log("CLOSE ${currentRoute.name}");
  137 + } else if (currentRoute.isGetPageRoute) {
  138 + Get.log("CLOSE TO ROUTE ${currentRoute.name}");
138 } 139 }
139 140
140 Get.reference = newRoute.name; 141 Get.reference = newRoute.name;