From b67ca269812b7b5b72d5b84df70fc7d8f077dc8e Mon Sep 17 00:00:00 2001
From: cimenmus <cimenmus@macbook-MacBook-Pro.local>
Date: Mon, 1 Oct 2018 22:35:29 +0300
Subject: [PATCH] onactivityresult() before onresume() for
 BaseActivity.currentActivity problem solved

---
 .../main/java/ch/pizzapp/android/fragment/MenuFragment.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/pizzapp/android/fragment/MenuFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/MenuFragment.java
index 136d298..9c671ae 100644
--- a/app/src/main/java/ch/pizzapp/android/fragment/MenuFragment.java
+++ b/app/src/main/java/ch/pizzapp/android/fragment/MenuFragment.java
@@ -79,7 +79,11 @@ public class MenuFragment extends BaseFragment {
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if(requestCode == REQUEST_CODE_PRODUCT_PROPERTIES && resultCode == RESULT_OK){
+        if(requestCode == REQUEST_CODE_PRODUCT_PROPERTIES &&
+                resultCode == RESULT_OK &&
+                getActivity() != null &&
+                getActivity() instanceof MainActivity){
+            BaseActivity.currentActivity = (MainActivity)getActivity();
             MainActivity mainActivity = (MainActivity) BaseActivity.currentActivity;
             mainActivity.setCartItemCount();
         }