Revert sigint handler

astuff · Nov 22, 2021 · ac04eb2 · ac04eb2
1 parent c703770
commit ac04eb2
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/avt_vimba_camera.cpp b/src/avt_vimba_camera.cpp
@@ -125,8 +125,6 @@ AvtVimbaCamera::AvtVimbaCamera(std::string name) {
   show_debug_prints_ = false;
   name_ = name;
 
-  signal(SIGINT, intHandler);
-
   camera_state_ = OPENING;
 
   updater_.setHardwareID("unknown");
@@ -186,7 +184,6 @@ void AvtVimbaCamera::start(std::string ip_str, std::string guid_str, bool debug_
   vimba_camera_ptr_->GetInterfaceType(cam_int_type);
   if ( cam_int_type == VmbInterfaceEthernet ){
     runCommand("GVSPAdjustPacketSize");
-
   }
 
   std::string trigger_source;
@@ -314,6 +311,9 @@ CameraPtr AvtVimbaCamera::openCamera(std::string id_str) {
   CameraPtr camera;
   VimbaSystem& vimba_system(VimbaSystem::GetInstance());
 
+  // set handler to catch ctrl+c presses
+  sighandler_t oldHandler = signal(SIGINT, intHandler);
+
   // get camera
   VmbErrorType err = vimba_system.GetCameraByID(id_str.c_str(), camera);
   while (err != VmbErrorSuccess) {
@@ -346,6 +346,9 @@ CameraPtr AvtVimbaCamera::openCamera(std::string id_str) {
     }
   }
 
+  // set previous handler back
+  signal(SIGINT, oldHandler);
+
   std::string cam_id, cam_name, cam_model, cam_sn, cam_int_id;
   VmbInterfaceType cam_int_type;
   VmbAccessModeType accessMode;  // = VmbAccessModeNone;