some fixes for stability;

F1ash · May 14, 2016 · c8e0da7 · c8e0da7
1 parent 4236638
commit c8e0da7
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/src/vm_viewer/krdc_vnc_qtonly/Machine_View.cpp b/src/vm_viewer/krdc_vnc_qtonly/Machine_View.cpp
@@ -133,8 +133,8 @@ void MachineView::reinitVNC()
 {
     if( stop_reinit ) return;
 
-    qWarning( "void MachineView::reinitVNC()",
-               "Reinit VNC. Attempt #" + QString::number(Init_Count+1) );
+    //qWarning( "void MachineView::reinitVNC()",
+    //           "Reinit VNC. Attempt #" + QString::number(Init_Count+1) );
 
     if( Init_Count < 10 )
     {
@@ -182,8 +182,8 @@ void MachineView::reinitVNC()
     {
         Reinit_Timer->stop();
 
-        qWarning("void MachineView::reinitVNC()", tr("Error!"),
-                         tr("Cannot Reinit VNC Connection!"), false );
+        //qWarning("void MachineView::reinitVNC()", tr("Error!"),
+        //                 tr("Cannot Reinit VNC Connection!"), false );
     }
 }
 

diff --git a/src/vm_viewer/qspice_widgets/qspice-display-channel.cpp b/src/vm_viewer/qspice_widgets/qspice-display-channel.cpp
@@ -31,16 +31,19 @@ void QSpiceHelper::display_primary_create(SpiceDisplayChannel *display,
 {
     Q_UNUSED(display)
 
-    QSpiceDisplayChannel *_display = static_cast<QSpiceDisplayChannel*>(user_data);
+    QSpiceDisplayChannel *_display =
+            static_cast<QSpiceDisplayChannel*>(user_data);
     if ( nullptr==_display ) return;
-    emit _display->displayPrimaryCreated(format, width, height, stride, shmid, imgdata);
+    emit _display->displayPrimaryCreated(
+                format, width, height, stride, shmid, imgdata);
 }
 
 void QSpiceHelper::display_primary_destroy(SpiceDisplayChannel *display,
                              gpointer             user_data)
 {
     Q_UNUSED(display)
-    QSpiceDisplayChannel *_display = static_cast<QSpiceDisplayChannel*>(user_data);
+    QSpiceDisplayChannel *_display =
+            static_cast<QSpiceDisplayChannel*>(user_data);
     if ( nullptr==_display ) return;
     emit _display->displayPrimaryDestroyed();
 }
@@ -53,7 +56,8 @@ void QSpiceHelper::display_invalidate (SpiceDisplayChannel *display,
                                 gpointer             user_data)
 {
     Q_UNUSED(display)
-    QSpiceDisplayChannel *_display = static_cast<QSpiceDisplayChannel*>(user_data);
+    QSpiceDisplayChannel *_display =
+            static_cast<QSpiceDisplayChannel*>(user_data);
     //if ( nullptr==_display ) return;
     //emit _display->displayInvalidated(x, y, width, height);
     // avoiding additional delay in updating
@@ -69,7 +73,8 @@ void QSpiceHelper::display_mark(SpiceDisplayChannel *display,
                          gpointer             user_data)
 {
     Q_UNUSED(display)
-    QSpiceDisplayChannel *_display = static_cast<QSpiceDisplayChannel*>(user_data);
+    QSpiceDisplayChannel *_display =
+            static_cast<QSpiceDisplayChannel*>(user_data);
     if ( nullptr==_display ) return;
     emit _display->displayMarked(mark);
 }

diff --git a/src/vm_viewer/qspice_widgets/qspice-usbdevice-manager.cpp b/src/vm_viewer/qspice_widgets/qspice-usbdevice-manager.cpp
@@ -120,7 +120,7 @@ void get_descriptions(gpointer item, void *res)
                 _dev, "%s %s<||>%s at %d-%d");
     dev.append(dev_desc);
     if ( dev_desc ) g_free(dev_desc);
-    _devList->append(dev);
+    if ( _devList!=nullptr ) _devList->append(dev);
 }
 
 QStringList QSpiceUsbDeviceManager::spiceUsbDeviceManager_get_devices()
@@ -140,6 +140,7 @@ QStringList QSpiceUsbDeviceManager::spiceUsbDeviceManager_get_devices_with_filte
     GPtrArray *_devs = spice_usb_device_manager_get_devices_with_filter(
                 (SpiceUsbDeviceManager*) gobject, filter.toUtf8().data());
     g_ptr_array_foreach(_devs, get_descriptions, &_devList);
+    g_ptr_array_free(_devs, true);
     return _devList;
 }
 
@@ -152,7 +153,7 @@ void get_operation_result(gpointer item, void *res)
                 _dev, "%s %s %s at %d-%d");
     dev.append(dev_desc);
     if ( dev_desc ) g_free(dev_desc);
-    if ( dev.contains(_res->id) ) {
+    if ( _res!=nullptr && dev.contains(_res->id) ) {
         _res->result = spice_usb_device_manager_is_device_connected(
                     (SpiceUsbDeviceManager*) _res->obj, _dev);
     };
@@ -181,7 +182,7 @@ void get_device_idx(gpointer item, void *res)
                 _dev, "%s %s %s at %d-%d");
     dev.append(dev_desc);
     if ( dev_desc ) g_free(dev_desc);
-    if ( dev.contains(_res->id) ) {
+    if ( _res!=nullptr && dev.contains(_res->id) ) {
         _res->idx = _res->size;
     };
     ++_res->size;
@@ -198,6 +199,7 @@ void QSpiceUsbDeviceManager::spiceUsbDeviceManager_finish_callback
         QSpiceUsbDeviceManager *obj =
                 static_cast<QSpiceUsbDeviceManager*>(
                     g_async_result_get_user_data(result));
+        if ( obj==nullptr ) return;
         QString err;
         size_t count = sizeof(errors)/sizeof(*errors);
         for ( uint i = 0; i<count; i++ ) {

diff --git a/src/vm_viewer/qspice_widgets/qspice-usbdevice-widget.cpp b/src/vm_viewer/qspice_widgets/qspice-usbdevice-widget.cpp
@@ -17,6 +17,7 @@ QSpiceUsbDeviceWidget::QSpiceUsbDeviceWidget(QWidget *parent) :
 /* private slots */
 void QSpiceUsbDeviceWidget::changeDeviceState(QListWidgetItem *item)
 {
+    if ( item==nullptr ) return;
     QString _id = QString("%1 %2")
             .arg(item->text()).arg(item->data(Qt::UserRole).toString());
     //qDebug()<<item->text()<<item->checkState();

diff --git a/src/vm_viewer/qspice_widgets/qspice-widget.cpp b/src/vm_viewer/qspice_widgets/qspice-widget.cpp
@@ -648,7 +648,7 @@ void QSpiceWidget::reloadUsbDevList(void *obj)
 {
     QSpiceUsbDeviceWidget *usbDevWdg =
             static_cast<QSpiceUsbDeviceWidget*>(obj);
-    if ( usbDevWdg ) {
+    if ( usbDevWdg && usbDevManager ) {
         usbDevWdg->setEnabled(false);
         usbDevWdg->clearList();
         QStringList _devList =