| … | … | ||
|---|---|---|---|
| 234 | 234 | ||
| 235 | attachable::do_destroy (); | 235 | attachable::do_destroy (); |
| 236 | 236 | ||
| 237 | if (ob) | 237 | if (ob) |
| 238 | { | 238 | { |
| 239 | // potentially fix a bug where ob->contr is non-null while ob->contr->ob is null, causing a segfault. | ||
| 240 | // temporarily backed out patchset 4025 to see if THIS change causes crashes | ||
| 239 | ob->contr = 0; | 241 | //ob->contr = 0; |
| 240 | ob->destroy (); | 242 | ob->destroy (); |
| 241 | } | 243 | } |
| 242 | 244 | ||
| 243 | ob = observe = viewpoint = 0; | 245 | ob = observe = viewpoint = 0; |
| 244 | } | 246 | } |
| – | Removed lines |
| + | Added lines |
| < | Changed lines |
| > | Changed lines |