summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lepus.uberspace.de>2015-01-18 14:22:46 +0100
committerhut <hut@lepus.uberspace.de>2015-01-18 14:23:23 +0100
commit737b48e27d0736b11f695c1bd96816ee9808092d (patch)
tree5a88ad124c16624fe4a1b0e9053e74860c47c3e4
parent28a38b116aa1f4e70f75800c66e019b116b64eb5 (diff)
downloadranger-737b48e27d0736b11f695c1bd96816ee9808092d.tar.gz
core.fm: rearranged loading order of tags
This avoids crashing on startup if there's a bookmarked file that is
tagged to a tag which is used in ":default_linemode tag=X ..."
-rw-r--r--ranger/core/fm.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/ranger/core/fm.py b/ranger/core/fm.py
index 87c14f7a..082df2f4 100644
--- a/ranger/core/fm.py
+++ b/ranger/core/fm.py
@@ -98,6 +98,9 @@ class FM(Actions, SignalDispatcher):
         self.rifle = Rifle(rifleconf)
         self.rifle.reload_config()
 
+        if not ranger.arg.clean and self.tags is None:
+            self.tags = Tags(self.confpath('tagged'))
+
         if self.bookmarks is None:
             if ranger.arg.clean:
                 bookmarkfile = None
@@ -109,9 +112,6 @@ class FM(Actions, SignalDispatcher):
                     autosave=self.settings.autosave_bookmarks)
             self.bookmarks.load()
 
-        if not ranger.arg.clean and self.tags is None:
-            self.tags = Tags(self.confpath('tagged'))
-
         self.ui.setup_curses()
         self.ui.initialize()
 
/a> 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368