From d64871882498bd471f2b7677c09fd0a86a6f7750 Mon Sep 17 00:00:00 2001
From: thuannd88 <Admin@DESKTOP-FIVUAQ9>
Date: Thu, 26 Sep 2024 13:50:21 +0700
Subject: [PATCH] =?UTF-8?q?fix=20l=E1=BB=97i=20b=C3=A1o=20m=C3=A1y=20in=20?=
 =?UTF-8?q?g=E1=BA=A7n=20h=E1=BA=BFt=20gi=E1=BA=A5y=20c=C3=B2n=2020=20l?=
 =?UTF-8?q?=E1=BA=A7n=20in?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.xaml.cs                       | 1 +
 AppData.cs                        | 7 ++-----
 UserControl/DepositSMUCv2.xaml.cs | 8 ++++++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/App.xaml.cs b/App.xaml.cs
index 7950444..c3f7f46 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -206,6 +206,7 @@ namespace SafeBagDE70
         protected override void OnExit(ExitEventArgs e)
         {
             // Release the mutex when the application is closed
+            AppData.UpdateDeviceStatusToFile();
             mutex?.ReleaseMutex();
             base.OnExit(e);
         }
diff --git a/AppData.cs b/AppData.cs
index eeec314..a48d727 100644
--- a/AppData.cs
+++ b/AppData.cs
@@ -551,11 +551,8 @@ namespace SafeBagDE70
             {
                 lock (deviceStatusFileName)
                 {
-                    if (File.Exists(deviceStatusFileName))
-                    {
-                        var fileContent = JsonConvert.SerializeObject(DeviceStatusFile);
-                        File.WriteAllText(deviceStatusFileName, fileContent);
-                    }
+                    var fileContent = JsonConvert.SerializeObject(DeviceStatusFile);
+                    File.WriteAllText(deviceStatusFileName, fileContent);
                 }
                 Log.Information("UpdatePrinterStatusFromFile success");
             }
diff --git a/UserControl/DepositSMUCv2.xaml.cs b/UserControl/DepositSMUCv2.xaml.cs
index 7b77ce2..6e3ef81 100644
--- a/UserControl/DepositSMUCv2.xaml.cs
+++ b/UserControl/DepositSMUCv2.xaml.cs
@@ -448,10 +448,14 @@ namespace SafeBagDE70
         private void GetPrinterStatus()
         {
             var status = printerManager.GetStatus();
+ 
             var strPrinterMessage = "";
+
             if (status != null)
             {
-                if (status.StsNOPAPER|| AppData.IsStopPrinting())
+                bool StsNOPAPER = status.StsNOPAPER;
+                bool StsNEARENDPAP =  status.StsNEARENDPAP;
+                if (StsNOPAPER || (StsNEARENDPAP && AppData.IsStopPrinting()))
                 {
                     AppData.DeviceStatus.PrinterStatus = (int)PrinterStatusCode.PAPEROUT;
                     StopTimers();
@@ -459,7 +463,7 @@ namespace SafeBagDE70
                     ShowError(strPrinterMessage);
                     AppData.ADMINDEVICESTATUS.PrinterStatus = strPrinterMessage;
                 }
-                else if (status.StsNEARENDPAP)
+                else if (StsNEARENDPAP)
                 {
                     AppData.UpdatePrinterStatus(true);
                     strPrinterMessage = "MÁY IN:  GẦN HẾT GIẤY";