diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp
index 138331a3e084a2775ac82861c876dd7a012724b5..0c00c48ed80131be980ac2f66e9dc4d6ca5c3ec9 100755
--- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp
@@ -77,10 +77,12 @@ void MainGUIWindow::doNumCrazyFlyZonesChanged(int n)
         }
 
         //  now unlink it from table also:
+        #ifdef CATKIN_MAKE
         if(cf_linker->isCFZoneLinked(n))
         {
             cf_linker->unlink_cf_zone(n);
         }
+        #endif
     }
     else if(ui->tabWidget->count() < scene->crazyfly_zones.size())
     {
@@ -186,8 +188,10 @@ void MainGUIWindow::_init()
 void MainGUIWindow::doTabClosed(int tab_index)
 {
     QString name = ui->tabWidget->tabText(tab_index);
+    #ifdef CATKIN_MAKE
     int cf_zone_index = cf_linker->getCFZoneIndexFromName(name);
     scene->removeCrazyFlyZone(cf_zone_index);
+    #endif
 }
 
 void MainGUIWindow::setTabIndex(int index)
@@ -482,8 +486,10 @@ void MainGUIWindow::on_tabWidget_currentChanged(int index)
 {
     // this index is tab index. Need to go to cf index
     QString name = ui->tabWidget->tabText(index);
+    #ifdef CATKIN_MAKE
     int cf_index = cf_linker->getCFZoneIndexFromName(name);
     scene->setSelectedCrazyFlyZone(cf_index);
+    #endif
 }
 
 void MainGUIWindow::centerViewIndex(int index)