Merge pull request #41 from Elly2018/v1.0.2

Cross apply preset, model 13 and model 12

Author: Elly2018

package/deb_master_amd64

@@ -1,5 +1,5 @@
 Package: go-pro-control-master
-Version: 0.1.3
+Version: 1.0.1
 Section: shells
 Priority: optional
 Architecture: amd64

package/deb_server_amd64

@@ -1,5 +1,5 @@
 Package: go-pro-control-server
-Version: 0.1.3
+Version: 1.0.1
 Section: shells
 Priority: optional
 Architecture: amd64

package/deb_server_arm64

@@ -1,5 +1,5 @@
 Package: go-pro-control-server
-Version: 0.1.3
+Version: 1.0.1
 Section: shells
 Priority: optional
 Architecture: arm64

src/master/GoProMaster.cpp

@@ -694,6 +694,10 @@ void GoProMaster::processMessage(const std::string& server, const std::string& m
                 std::cerr << "query:get, return value should be array" << std::endl;
                 return;
             }
+            if(key == "query:get" && data["value"]["data"].size() == 0){
+                std::cout << "Camera response null state from server: " << server << std::endl;
+                return;
+            }
             /**
              * In case you're confuse here...
              * The data is like this
@@ -722,6 +726,9 @@ void GoProMaster::processMessage(const std::string& server, const std::string& m
                     continue;
                 }
                 std::string ip_ref = ip.value()["ip"].get<std::string>();
+                if(ip_ref.size() == 0){
+                    continue;
+                }
                 int32_t found = findCamera(server, ip_ref);
                 CameraInfo _cam;
                 if(found == -1){
@@ -899,6 +906,7 @@ void GoProMaster::replaceCameraFromServer(const std::string server, const std::v
         }
         return false;
     });
+    
     cameras.erase(it, cameras.end());
 
     // Append part

src/master/windows/inspector/filter.cpp

@@ -264,8 +264,8 @@ bool InspectorWindow::conditional_filter_option(const std::shared_ptr<GlobalStat
                     }
                 }
                 else if(aspect_id == 3){ // 8:7
-                    // 30, 60, 24
-                    if(value_id != 8 && value_id != 5 && value_id != 10) return false;                    
+                    // 30, 24
+                    if(value_id != 8 && value_id != 10) return false;                    
                 }
             }
         }

src/server/main.cpp

@@ -383,7 +383,6 @@ void MediaAction(const WebSocketChannelPtr& channel, json j){
     }
 }
 
-
 void PreviewAction(const WebSocketChannelPtr& channel, json j){
     std::string target = "";
     std::string name = "";