pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into devel

Browse source 
Conflicts:
	CHANGELOG.md
This commit is contained in:
Gina Häußge 2014-09-13 22:01:12 +02:00
commit 1c19bb4dfc
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CHANGELOG.md
View file

@ -1,6 +1,6 @@
# OctoPrint Changelog # OctoPrint Changelog
## 1.2.0 - Unreleased ## 1.2.0 (Unreleased)
### New Features ### New Features
@ -33,7 +33,13 @@
* [#435](https://github.com/foosel/OctoPrint/issues/435) - Always interpret negative duration (e.g. for print time left) * [#435](https://github.com/foosel/OctoPrint/issues/435) - Always interpret negative duration (e.g. for print time left)
as 0 as 0
## 1.1.0 - 2014-09-03 ## 1.1.1 (Unreleased)
### Bug Fixes
* [#580](https://github.com/foosel/OctoPrint/issues/580) - Properly unset job data when instructed so by callers
## 1.1.0 (2014-09-03)
### New Features ### New Features
@ -103,6 +109,6 @@
([Commits](https://github.com/foosel/OctoPrint/compare/1.0.0...1.1.0)) ([Commits](https://github.com/foosel/OctoPrint/compare/1.0.0...1.1.0))
## 1.0.0 ## 1.0.0 (2014-06-22)
First release with new versioning scheme. First release with new versioning scheme.

11
src/octoprint/printer.py
View file

@ -388,6 +388,17 @@ class Printer():
} }
else: else:
self._selectedFile = None self._selectedFile = None
self._stateMonitor.setJobData({
"file": {
"name": None,
"origin": None,
"size": None,
"date": None
},
"estimatedPrintTime": None,
"filament": None,
})
return
estimatedPrintTime = None estimatedPrintTime = None
lastPrintTime = None lastPrintTime = None