Merge pull request #16 from Pennywise007/issue_15

Author: Chaoses-Ib

Simulator/include/IbInputSimulator/SendTypes/Logitech.hpp

@@ -229,7 +229,7 @@ namespace Send::Type::Internal {
         }
     };
 
-    class Logitech final : virtual public Base, public VirtualKeyStates {
+    class Logitech final : public VirtualKeyStates {
         LogitechDriver driver;
     public:
         Logitech() : VirtualKeyStates(keyboard_report.modifiers, keyboard_mutex) {}

Simulator/include/IbInputSimulator/SendTypes/Razer.hpp

@@ -3,7 +3,7 @@
 #include "usb.hpp"
 
 namespace Send::Type::Internal {
-    class Razer final : virtual public Base, public VirtualKeyStates {
+    class Razer final : public VirtualKeyStates {
         HANDLE device;
 
         KeyboardModifiers modifiers;

Simulator/include/IbInputSimulator/SendTypes/base.hpp

@@ -76,6 +76,7 @@ namespace Send::Type::Internal {
             this->get_key_state_fallback = get_key_state_fallback;
         }
 
+        virtual ~Base() = default;
         virtual void destroy() = 0;
 
         virtual uint32_t send_input(const INPUT inputs[], uint32_t n) {
@@ -139,7 +140,7 @@ namespace Send::Type::Internal {
         bool RGui : 1;
     };
 
-    class VirtualKeyStates : virtual public Base {
+    class VirtualKeyStates : public Base {
         KeyboardModifiers& modifiers;
         std::mutex& mutex;
 

Simulator/source/dllmain.cpp

@@ -165,7 +165,7 @@ DLLAPI void __stdcall IbSendDestroy() {
     if (!main::send)
         return;
     main::send->destroy();
-    main::send.release();
+    main::send.reset();
 }
 
 DLLAPI void __stdcall IbSendSyncKeyStates() {