[VM][EVENT][LOGGER][Qt] Improve event log.

diff --git a/source/src/qt/gui/agar_logger.cpp b/source/src/qt/gui/agar_logger.cpp
index c36cff4..c661578 100644 (file)
--- a/source/src/qt/gui/agar_logger.cpp
+++ b/source/src/qt/gui/agar_logger.cpp
@@ -43,7 +43,7 @@ CSP_Logger::CSP_Logger(bool b_syslog, bool cons, const char *devname)
                "SCREEN",
                "PRINTER",
                "SOCKET",
-               "EVENT"
+               "EVENT",
                "Undefined",
                NULL
        };
@@ -377,7 +377,7 @@ void CSP_Logger::output_event_log(int device_id, int level, const char *fmt, ...
        char devname[128];
        char *p = NULL;
        if(p_osd != NULL) {
-               *p = (char *)p_osd->get_vm_node_name(device_id);
+               p = (char *)p_osd->get_vm_node_name(device_id);
        }
        if(p == NULL) {
                snprintf(devname, 127, "DEVICE#%d", device_id);

diff --git a/source/src/vm/event.cpp b/source/src/vm/event.cpp
index 2f52c74..92660ac 100644 (file)
--- a/source/src/vm/event.cpp
+++ b/source/src/vm/event.cpp
@@ -346,9 +346,21 @@ void EVENT::cancel_event(DEVICE* device, int register_id)
        if(0 <= register_id && register_id < MAX_EVENT) {
                event_t *event_handle = &event[register_id];
                if(device != NULL && device != event_handle->device) {
+#if defined(_USE_QT)                   
+
+                       csp_logger->output_event_log(device->this_device_id, CSP_LOG_INFO,
+                                                                                _T("Event cannot be canceled by non owned device (device_id=%d register_id=%d) !!!\n"),
+                                                                                device->this_device_id, register_id);
+#else                  
                        this->out_debug_log(_T("EVENT: event cannot be canceled by non owned device (id=%d) !!!\n"), device->this_device_id);
+#endif                 
                        return;
                }
+#ifdef _DEBUG_LOG              
+# if defined(_USE_QT)                  
+               if(device != NULL) csp_logger->output_event_log(device->this_device_id, CSP_LOG_INFO, _T("Canceling event was succeeded (id=%d  register_id=%d)"), device->this_device_id, register_id);
+# endif
+#endif
                if(event_handle->active) {
                        if(event_handle->prev != NULL) {
                                event_handle->prev->next = event_handle->next;