From 5afa767b4a52f1e4886546e1cd1c0a9477445d78 Mon Sep 17 00:00:00 2001
From: simon <Anise5-humid5-Allow-5Lulu-Honk>
Date: Fri, 29 Dec 2017 17:09:30 -0500
Subject: [PATCH] Fixed OF and CF flags being always set to false in the other
 function

---
 .../server/assembly/instruction/MulInstruction.java         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/MulInstruction.java b/Server/src/main/java/net/simon987/server/assembly/instruction/MulInstruction.java
index 3b86d05..62747e1 100644
--- a/Server/src/main/java/net/simon987/server/assembly/instruction/MulInstruction.java
+++ b/Server/src/main/java/net/simon987/server/assembly/instruction/MulInstruction.java
@@ -46,9 +46,11 @@ public class MulInstruction extends Instruction {
             status.setOverflowFlag(true);
             status.setCarryFlag(true);
             cpu.getRegisterSet().getRegister("Y").setValue(hWord);//Don't overwrite Y register if it's blank
+        } else {
+            status.setOverflowFlag(false);
+            status.setCarryFlag(false);
         }
-        status.setOverflowFlag(false);
-        status.setCarryFlag(false);
+
         cpu.getRegisterSet().getRegister("A").setValue(Util.getLowerWord(result));
 
         return status;