Commit d8ae71b0 authored by Alejandro Homs Puron's avatar Alejandro Homs Puron Committed by operator for beamline
Browse files

Destroy Receiver::Port::Thread and Camera::AcqThread before other members

parent 6368a954
......@@ -288,7 +288,6 @@ private:
PixelDepth m_pixel_depth;
ImageType m_image_type;
bool m_raw_mode;
AutoPtr<AcqThread> m_acq_thread;
State m_state;
double m_new_frame_timeout;
double m_abort_sleep_time;
......@@ -297,6 +296,7 @@ private:
TimeRangesChangedCallback *m_time_ranges_cb;
PixelDepthCPUAffinityMap m_cpu_affinity_map;
GlobalCPUAffinityMgr m_global_cpu_affinity_mgr;
AutoPtr<AcqThread> m_acq_thread;
};
} // namespace SlsDetector
......
......@@ -135,8 +135,8 @@ private:
Mutex m_mutex;
FrameMap::Item *m_frame_map_item;
IntList m_bad_frame_list;
Thread m_thread;
Stats m_stats;
Thread m_thread;
};
typedef std::vector<AutoPtr<Port> > PortList;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment