From f41b5c4a790cdca1e43c1c33281ba26807f90b4a Mon Sep 17 00:00:00 2001
From: EricLiu2000 <ericxliu@gmail.com>
Date: Thu, 1 Aug 2019 14:07:42 -0400
Subject: [PATCH] Removed cancellation of error downgrading after closing, was
 causing read access violations.

---
 communication/communication.cpp             | 2 --
 communication/multichannelcommunication.cpp | 1 -
 platform/posix/ftdi.cpp                     | 2 --
 platform/posix/pcap.cpp                     | 2 --
 platform/posix/stm32.cpp                    | 1 -
 platform/windows/pcap.cpp                   | 2 --
 platform/windows/vcp.cpp                    | 2 --
 7 files changed, 12 deletions(-)

diff --git a/communication/communication.cpp b/communication/communication.cpp
index efad262..3610651 100644
--- a/communication/communication.cpp
+++ b/communication/communication.cpp
@@ -168,6 +168,4 @@ void Communication::readTask() {
 			}
 		}
 	}
-
-	EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
 }
diff --git a/communication/multichannelcommunication.cpp b/communication/multichannelcommunication.cpp
index cef64a1..29085de 100644
--- a/communication/multichannelcommunication.cpp
+++ b/communication/multichannelcommunication.cpp
@@ -129,5 +129,4 @@ void MultiChannelCommunication::readTask() {
 		}
 		
 	}
-	EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
 }
\ No newline at end of file
diff --git a/platform/posix/ftdi.cpp b/platform/posix/ftdi.cpp
index be449ac..5f29fd6 100644
--- a/platform/posix/ftdi.cpp
+++ b/platform/posix/ftdi.cpp
@@ -185,7 +185,6 @@ void FTDI::readTask() {
 		if(readBytes > 0)
 			readQueue.enqueue_bulk(readbuf, readBytes);
 	}
-	EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
 }
 
 void FTDI::writeTask() {
@@ -198,5 +197,4 @@ void FTDI::writeTask() {
 		ftdi.write(writeOp.bytes.data(), (int)writeOp.bytes.size());
 		onWrite();
 	}
-	EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
 }
\ No newline at end of file
diff --git a/platform/posix/pcap.cpp b/platform/posix/pcap.cpp
index 34c3cc3..9df9ad1 100644
--- a/platform/posix/pcap.cpp
+++ b/platform/posix/pcap.cpp
@@ -257,7 +257,6 @@ void PCAP::readTask() {
 
 		readQueue.enqueue_bulk(packet.payload.data(), packet.payload.size());
 	}
-	EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
 }
 
 void PCAP::writeTask() {
@@ -281,7 +280,6 @@ void PCAP::writeTask() {
 			pcap_sendpacket(interface.fp, bs.data(), (int)bs.size());
 		// TODO Handle packet send errors
 	}
-	EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
 }
 
 PCAP::EthernetPacket::EthernetPacket(const std::vector<uint8_t>& bytestream) {
diff --git a/platform/posix/stm32.cpp b/platform/posix/stm32.cpp
index cf376e1..db38805 100644
--- a/platform/posix/stm32.cpp
+++ b/platform/posix/stm32.cpp
@@ -309,5 +309,4 @@ void STM32::writeTask() {
 			report(APIEvent::Type::FailedToWrite, APIEvent::Severity::Error);
 		onWrite();
 	}
-	EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
 }
\ No newline at end of file
diff --git a/platform/windows/pcap.cpp b/platform/windows/pcap.cpp
index 997286d..de613cf 100644
--- a/platform/windows/pcap.cpp
+++ b/platform/windows/pcap.cpp
@@ -276,7 +276,6 @@ void PCAP::readTask() {
 
 		readQueue.enqueue_bulk(packet.payload.data(), packet.payload.size());
 	}
-	EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
 }
 
 void PCAP::writeTask() {
@@ -301,7 +300,6 @@ void PCAP::writeTask() {
 		onWrite();
 		// TODO Handle packet send errors
 	}
-	EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
 }
 
 PCAP::EthernetPacket::EthernetPacket(const std::vector<uint8_t>& bytestream) {
diff --git a/platform/windows/vcp.cpp b/platform/windows/vcp.cpp
index 19850bc..2bedd23 100644
--- a/platform/windows/vcp.cpp
+++ b/platform/windows/vcp.cpp
@@ -385,7 +385,6 @@ void VCP::readTask() {
 			}
 		}
 	}
-	EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
 }
 
 void VCP::writeTask() {
@@ -428,5 +427,4 @@ void VCP::writeTask() {
 			}
 		}
 	}
-	EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
 }
\ No newline at end of file