From 26eb4f46b7affb9c5c751181b9965f33aae86af5 Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Wed, 26 Jun 2024 21:58:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/xypower/mpmaster/AppMaster.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java b/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java
index fcd356ce..b1d0c3e5 100644
--- a/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java
+++ b/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java
@@ -806,7 +806,8 @@ public class AppMaster {
             return false;
         }
 
-        MicroPhotoContext.AppConfig appConfig = MicroPhotoContext.getMpAppConfig(mService.getApplicationContext());
+        final Context context = mService.getApplicationContext();
+        MicroPhotoContext.AppConfig appConfig = MicroPhotoContext.getMpAppConfig(context);
 
         if (TextUtils.equals(ip, appConfig.server) && port == appConfig.port) {
             mService.logger.info("New CMA is not changed");
@@ -816,9 +817,10 @@ public class AppMaster {
         appConfig.server = ip;
         appConfig.port = port;
 
-        MicroPhotoContext.saveMpAppConfig(mService.getApplicationContext(), appConfig);
+        MicroPhotoContext.saveMpAppConfig(context, appConfig);
 
         mService.logger.warning("Restart MpAPP for CMA changing");
+
         Thread th = new Thread(new Runnable() {
             @Override
             public void run() {
@@ -827,7 +829,7 @@ public class AppMaster {
                 } catch (Exception ex) {
 
                 }
-                MicroPhotoContext.restartMpApp(mService.getApplicationContext());
+                MicroPhotoContext.restartMpApp(context);
             }
         });