Commit 20ebeb5
Evgeni Raikhel
Revert generic grid_overlay protection from config_file::save()
Per Nir-Az's review comment: the grid/crosshair overlay is a
viewer_model-scoped feature and has no business special-casing the
generic config_file save/set path used by every other feature (device
options, DDS settings, window geometry, ...). Removes
_grid_overlay_dirty, is_grid_overlay_path(), and the disk-read/merge
that save() ran on every flush to protect that one section.
This intentionally re-opens the narrower issue the removed code was
guarding against: hand-editing viewer_model.grid_overlay.* in
realsense-config.json while the viewer is running can still be
silently clobbered by the next unrelated config save. Left unaddressed
here to keep this PR scoped to the crosshair feature; worth a separate,
narrowly-targeted fix if it's worth solving at all.1 parent fb34c6a commit 20ebeb5
2 files changed
Lines changed: 0 additions & 47 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
113 | 113 | | |
114 | 114 | | |
115 | 115 | | |
116 | | - | |
117 | 116 | | |
118 | 117 | | |
119 | 118 | | |
| |||
128 | 127 | | |
129 | 128 | | |
130 | 129 | | |
131 | | - | |
132 | | - | |
133 | | - | |
134 | | - | |
135 | | - | |
136 | | - | |
137 | 130 | | |
138 | 131 | | |
139 | 132 | | |
140 | | - | |
141 | | - | |
142 | | - | |
143 | | - | |
144 | | - | |
145 | | - | |
146 | | - | |
147 | | - | |
148 | | - | |
149 | | - | |
150 | | - | |
151 | | - | |
152 | | - | |
153 | | - | |
154 | | - | |
155 | | - | |
156 | | - | |
157 | | - | |
158 | | - | |
159 | | - | |
160 | | - | |
161 | | - | |
162 | | - | |
163 | | - | |
164 | 133 | | |
165 | 134 | | |
166 | 135 | | |
| |||
194 | 163 | | |
195 | 164 | | |
196 | 165 | | |
197 | | - | |
198 | 166 | | |
199 | 167 | | |
200 | 168 | | |
| |||
214 | 182 | | |
215 | 183 | | |
216 | 184 | | |
217 | | - | |
218 | | - | |
219 | | - | |
220 | | - | |
221 | 185 | | |
222 | | - | |
223 | 186 | | |
224 | 187 | | |
225 | 188 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
156 | 156 | | |
157 | 157 | | |
158 | 158 | | |
159 | | - | |
160 | | - | |
161 | 159 | | |
162 | 160 | | |
163 | 161 | | |
| |||
201 | 199 | | |
202 | 200 | | |
203 | 201 | | |
204 | | - | |
205 | | - | |
206 | 202 | | |
207 | 203 | | |
208 | 204 | | |
| |||
214 | 210 | | |
215 | 211 | | |
216 | 212 | | |
217 | | - | |
218 | | - | |
219 | | - | |
220 | | - | |
221 | | - | |
222 | 213 | | |
223 | 214 | | |
224 | 215 | | |
| |||
230 | 221 | | |
231 | 222 | | |
232 | 223 | | |
233 | | - | |
234 | 224 | | |
235 | 225 | | |
236 | 226 | | |
| |||
0 commit comments