Merge remote-tracking branch 'samnazarko/master' into test

Conflicts:
	recovery/multiimagewritethread.cpp

Author: NicoHood

recovery/multiimagewritethread.cpp

@@ -497,7 +497,8 @@ bool MultiImageWriteThread::processImage(OsInfo *image)
         Json::saveToFile("/mnt2/os_config.json", qm);
 
         emit statusUpdate(tr("%1: Saving display mode to config.txt").arg(os_name));
-        patchConfigTxt();
+        if ( ! image->managevideo())
+            patchConfigTxt();
 
         /* Partition setup script can either reside in the image folder
          * or inside the boot partition tarball */

recovery/osinfo.cpp

@@ -12,6 +12,7 @@ OsInfo::OsInfo(const QString &folder, const QString &flavour, QObject *parent) :
     _releaseDate = m.value("release_date").toString();
     _bootable = m.value("bootable", true).toBool();
     _riscosOffset = m.value("riscos_offset").toInt();
+    _managevideo = m.value("managevideo", false).toBool();
 
     QVariantList parts = Json::loadFromFile(folder+"/partitions.json").toMap().value("partitions").toList();
     foreach (QVariant pv, parts)

recovery/osinfo.h

@@ -53,6 +53,11 @@ class OsInfo : public QObject
         return _bootable;
     }
 
+    inline bool managevideo()
+    {
+        return _managevideo;
+    }
+
     inline QList<PartitionInfo *> *partitions()
     {
         return &_partitions;
@@ -66,6 +71,7 @@ class OsInfo : public QObject
 protected:
     QString _folder, _flavour, _name, _description, _version, _releaseDate;
     bool _bootable;
+    bool _managevideo;
     QList<PartitionInfo *> _partitions;
     int _riscosOffset;