Merge pull request #6 from selmf/9.5.0_bugfixes

9.5.0 bugfixes

YACReader/main_window_viewer.cpp

@@ -1682,7 +1682,10 @@ void MainWindowViewer::decreasePageZoomLevel()
 void MainWindowViewer::sendComic()
 {
     YACReaderLocalClient  * client = new YACReaderLocalClient;
+  
+		connect(client, &YACReaderLocalClient::finished, client, &YACReaderLocalClient::deleteLater);
     currentComicDB.info.lastTimeOpened = QDateTime::currentMSecsSinceEpoch() / 1000;
+
     viewer->updateComic(currentComicDB);
 
     if (currentComicDB.info.currentPage == currentComicDB.info.numPages) {
@@ -1694,13 +1697,10 @@ void MainWindowViewer::sendComic()
             int retries = 1;
             while(!client->sendComicInfo(libraryId, currentComicDB, nextComic.id) && retries!=0)
                 retries--;
-            connect(client,SIGNAL(finished()),client,SLOT(deleteLater()));
         }
     } else {
         int retries = 1;
         while(!client->sendComicInfo(libraryId, currentComicDB) && retries!=0)
             retries--;
-        connect(client,SIGNAL(finished()),client,SLOT(deleteLater()));
     }
-    //delete client;
 }

YACReaderLibrary/comic_vine/sort_volume_comics.cpp

@@ -86,7 +86,7 @@ SortVolumeComics::SortVolumeComics(QWidget *parent) :
     //rows actions
     QAction * removeItemFromList = new QAction(tr("remove selected comics"),this);
     QAction * restoreAllItems = new QAction(tr("restore all removed comics"),this);
-    QAction * restoreItems = new QAction(tr("restore removed comics"),this);
+    //QAction * restoreItems = new QAction(tr("restore removed comics"),this);
 
     tableFiles->setContextMenuPolicy(Qt::ActionsContextMenu);
     tableFiles->addAction(removeItemFromList);
@@ -95,7 +95,7 @@ SortVolumeComics::SortVolumeComics(QWidget *parent) :
 
     connect(removeItemFromList,SIGNAL(triggered()),this,SLOT(removeSelectedComics()));
     connect(restoreAllItems,SIGNAL(triggered()),this,SLOT(restoreAllComics()));
-    connect(restoreItems,SIGNAL(triggered()),this,SLOT(showRemovedComicsSelector()));
+    //connect(restoreItems,SIGNAL(triggered()),this,SLOT(showRemovedComicsSelector()));
 }
 
 void SortVolumeComics::setData(QList<ComicDB> & comics, const QString &json, const QString &vID)

YACReaderLibrary/db/folder_model.cpp

@@ -823,7 +823,13 @@ void FolderModelProxy::setupFilteredModelData(QSqlQuery &sqlquery, FolderItem *p
 
             //si el nodo es hijo de 1 y no hab<61>a sido previamente insertado como hijo, se a<>ade como tal
             if(!parentPreviousInserted)
+            {
                 filteredItems.value(ROOT)->appendChild(item);
             }
+            else
+            {
+                delete item;
+            }
+        }
     }
 }

YACReaderLibrary/server/lib/httpserver/httprequest.cpp

@@ -460,6 +460,8 @@ void HttpRequest::parseMultiPartFile()
                 else if (!fileName.isEmpty() && !fieldName.isEmpty())
                 {
                     // last field was a file
+                    if (uploadedFile)
+                    {
                         #ifdef SUPERVERBOSE
                             qDebug("HttpRequest: finishing writing to uploaded file");
                         #endif
@@ -471,6 +473,11 @@ void HttpRequest::parseMultiPartFile()
                         uploadedFiles.insert(fieldName,uploadedFile);
                         qDebug("HttpRequest: uploaded file size is %i",(int) uploadedFile->size());
                     }
+                    else
+                    {
+                        qWarning("HttpRequest: format error, unexpected end of file data");
+                    }
+                }
                 if (line.contains(boundary+"--"))
                 {
                     finished=true;
@@ -546,4 +553,3 @@ QHostAddress HttpRequest::getPeerAddress() const
 {
     return peerAddress;
 }
-

YACReaderLibrary/server/lib/logging/filelogger.cpp

@@ -92,8 +92,8 @@ void FileLogger::write(const LogMessage* logMessage)
         // Check for success
         if (file->error())
         {
-            close();
             qWarning("Cannot write to log file %s: %s",qPrintable(fileName),qPrintable(file->errorString()));
+            close();
         }
 
     }

custom_widgets/yacreader_options_dialog.cpp

@@ -275,6 +275,8 @@ void YACReaderOptionsDialog::restoreOptions(QSettings * settings)
 	case 5:
 		flowType = Custom;
 		break;
+	default:
+		flowType = CoverFlowLike;
 	}