Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8a908a7656c3
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 010c68f0a19b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Mar 29, 2016

  1. gui: log error and bail out on artiq_gui.pyon write failure (#360)

    @sbourdeauducq
    sbourdeauducq committed Mar 29, 2016

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    GPG key ID: 5CC908FDB71E12C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6011444 View commit details

  2. Merge branch 'master' of github.com:m-labs/artiq

    @sbourdeauducq
    sbourdeauducq committed Mar 29, 2016
    Copy the full SHA
    010c68f View commit details
Showing with 5 additions and 0 deletions.
  1. +5 −0 artiq/gui/state.py
5 changes: 5 additions & 0 deletions artiq/gui/state.py
View file
Original file line number Diff line number Diff line change
@@ -74,5 +74,10 @@ async def _do(self):
while True:
await asyncio.sleep(self.autosave_period)
self.save()
except asyncio.CancelledError:
pass
except:
logger.error("Uncaught exception attempting to save state",
exc_info=True)
finally:
self.save()