[Kstars-devel] KDE/kdeedu/kstars/kstars

[Jasem Mutlaq]

SVN commit 534601 by mutlaqja:

Applying part of thorsten patch, thanks!

CCMAIL: kstars-devel at kde.org
thorsten.roeder at weihenstephan.org

Patch will affect 3.5 and HEAD. Will work on possible INDI bugs and QMenu changes next.




 M  +1 -1      fitshistogram.cpp  
 M  +1 -0      fitsprocess.cpp  
 M  +12 -0     indidevice.cpp  
 M  +1 -1      indistd.cpp  


--- trunk/KDE/kdeedu/kstars/kstars/fitshistogram.cpp #534600:534601
@@ -162,7 +162,7 @@
       histArray[i] = 0;
     binSize = ( (double) range / (double) BARS); 
     
-    if (binSize == 0 && buffer == NULL)
+    if (binSize == 0 || buffer == NULL)
      return;
     
      for (int i=0; i < fits_w * fits_h; i++)
--- trunk/KDE/kdeedu/kstars/kstars/fitsprocess.cpp #534600:534601
@@ -152,6 +152,7 @@
       break;	    
      }
      
+     free(narray);
      return dest;
 }
  
--- trunk/KDE/kdeedu/kstars/kstars/indidevice.cpp #534600:534601
@@ -903,7 +903,11 @@
 		}
 		err = pp->buildMenuGUI (root, errmsg);
 		if (err < 0)
+		{
 		    delete(pp);
+		    pp = 0;
+		    return err;
+		}
 		    
 		pp->pg->addProperty(pp);
 		if (isGroupVisible)
@@ -920,7 +924,11 @@
 		}
 	    err = pp->buildSwitchesGUI(root, errmsg);
 	    if (err < 0)
+	    {
 	      delete (pp);
+	      pp =0;
+	      return err;
+	    }
 	      
 	    pp->pg->addProperty(pp);
 	    if (isGroupVisible)
@@ -939,7 +947,11 @@
 		}
 	    err = pp->buildSwitchesGUI(root, errmsg);
 	    if (err < 0)
+	    {
 	      delete (pp);
+	      pp=0;
+	      return err;
+	    }
 
 	    if (isGroupVisible)
 		pp->pg->dp->parent->mainTabWidget->show();
--- trunk/KDE/kdeedu/kstars/kstars/indistd.cpp #534600:534601
@@ -493,7 +493,7 @@
 	  seqCount = newFileIndex + 1;
    }
    
-   delete (tempPrefix);
+   delete [] (tempPrefix);
           
  }