Updated logic

rnayabed · Apr 17, 2020 · ef895b8 · ef895b8
1 parent 60e61e3
commit ef895b8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/src/PCHWRMClient/Main.java b/src/PCHWRMClient/Main.java
@@ -3,22 +3,26 @@
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
+import javafx.scene.image.Image;
 import javafx.stage.Stage;
 
 public class Main extends Application {
     @Override
-    public void start(Stage primaryStage) throws Exception {
+    public void start(Stage primaryStage)
+    {
         Platform.setImplicitExit(false);
         dash d = new dash(this, primaryStage);
         Scene s = new Scene(d);
         primaryStage.setScene(s);
+        primaryStage.getIcons().add(new Image(getClass().getResource("assets/icon.png").toExternalForm()));
         primaryStage.setResizable(false);
-        primaryStage.setTitle("PCHWRM By github.com/dubbadhar <3");
+        primaryStage.setTitle("PCHWRM Client By github.com/dubbadhar <3");
         primaryStage.show();
         primaryStage.setOnCloseRequest(event->{
             try
             {
                 if(d.isConnected){
+                    d.writeToOS("QUIT");
                     Thread.sleep(500);
                     d.isConnected=false;
                 }

diff --git a/src/PCHWRMClient/dash.java b/src/PCHWRMClient/dash.java
@@ -118,9 +118,11 @@ public void minimizeToTraySetup()
                 exitItem.addActionListener(l->{
                     try {
                         if(isConnected){
+                            writeToOS("QUIT");
                             Thread.sleep(500);
                             isConnected=false;
                         }
+                        tray.remove(ti);
                         Platform.exit();
                     }
                     catch (Exception e)
@@ -519,7 +521,7 @@ public ArrayList<String[]> getValuesFromWMI() throws Exception
         String out = io.getShellOutput("powershell.exe get-wmiobject -namespace root\\OpenHardwareMonitor -query 'SELECT Value,Name,SensorType FROM Sensor'").replace("\r\n\r\n__GENUS          : 2\r\n__CLASS          : Sensor\r\n__SUPERCLASS     : \r\n__DYNASTY        : \r\n__RELPATH        : \r\n__PROPERTY_COUNT : 3\r\n__DERIVATION     : {}\r\n__SERVER         : \r\n__NAMESPACE      : \r\n__PATH           : \r\n","");
         ArrayList<String[]> returnable = new ArrayList<>();
 
-        String[] x = out.split("PSComputerName   :");
+        String[] x = out.split("PSComputerName {3}:");
 
         for(int i =0;i<x.length - 1;i++)
         {

diff --git a/src/PCHWRMClient/io.java b/src/PCHWRMClient/io.java
@@ -25,7 +25,7 @@ public void writeToFile(String content,String fileName)
         {
             File f = new File(fileName);
             if(!f.exists())
-                f.createNewFile();
+                if(!f.createNewFile()) throw new Exception("Insufficient Permissions to create "+fileName);
             BufferedWriter bf = new BufferedWriter(new FileWriter(fileName));
             bf.write(content);
             bf.close();